liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manually select java for jar executor #282

This commit is contained in:
ShirosakiMio 2024-08-20 20:33:44 +08:00
parent 429667ac29
commit d507998e79
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FCL/src/main/java/com/tungsten/fcl/game/JarExecutorHelper.java
View File

@ -11,6 +11,8 @@ import android.util.Log;
import com.tungsten.fcl.activity.JVMActivity;
import com.tungsten.fcl.control.MenuType;
import com.tungsten.fcl.setting.Profile;
import com.tungsten.fcl.setting.Profiles;
import com.tungsten.fcl.util.AndroidUtils;
import com.tungsten.fcl.util.RequestCodes;
import com.tungsten.fclauncher.FCLConfig;
@ -59,6 +61,13 @@ public class JarExecutorHelper {
private static void launchJarExecutor(Context context, File file) {
int version = getJavaVersion(file);
int javaVersion = getNearestJavaVersion(version);
Profile profile = Profiles.getSelectedProfile();
if (profile != null) {
String java = profile.getGlobal().getJava();
if (!java.equals(JavaVersion.JAVA_AUTO.getVersionName())) {
javaVersion = JavaVersion.getJavaFromVersionName(java).getVersion();
}
}
exec(context, file, javaVersion, null);
}