From 6a4eccb07be5137a627b898fca5c1f96304af024 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Wed, 2 Dec 2020 15:21:33 +0700 Subject: [PATCH] [JVM Launch] Bug fix: attempt to run multiple JVM instances --- .../pojavlaunch/JavaGUILauncherActivity.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index 03f9340d4..243deb68f 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -12,6 +12,7 @@ import net.kdt.pojavlaunch.installers.*; import net.kdt.pojavlaunch.utils.*; import org.lwjgl.glfw.*; import android.content.*; +import android.system.*; public class JavaGUILauncherActivity extends LoggableActivity { private AWTCanvasView mTextureView; @@ -72,16 +73,19 @@ public class JavaGUILauncherActivity extends LoggableActivity { @Override public void run() { try { - doCustomInstall(modFile, javaArgs); + final int exit = doCustomInstall(modFile, javaArgs); appendlnToLog(getString(R.string.toast_optifine_success)); - runOnUiThread(new Runnable(){ - - @Override - public void run() { - Toast.makeText(JavaGUILauncherActivity.this, R.string.toast_optifine_success, Toast.LENGTH_SHORT).show(); - finish(); - } - }); + if (exit == 0) { + runOnUiThread(new Runnable(){ + @Override + public void run() { + Toast.makeText(JavaGUILauncherActivity.this, R.string.toast_optifine_success, Toast.LENGTH_SHORT).show(); + MainActivity.fullyExit(); + } + }); + } /* else { + throw new ErrnoException(getString(R.string.glo, exit); + } */ } catch (Throwable e) { appendlnToLog("Install failed:"); appendlnToLog(Log.getStackTraceString(e));