From 9741b05dfdf8325c96fbca6df0285f0769cacf61 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Tue, 6 Oct 2020 15:28:29 +0700
Subject: [PATCH] Handle java exit code

---
 app/src/main/java/net/kdt/pojavlaunch/Tools.java | 13 ++++++++-----
 app/src/main/res/values/strings.xml              |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
index 04c0a7e95..b859a56df 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -72,7 +72,8 @@ public final class Tools
 	public static final int LAUNCH_TYPE = LTYPE_INVOCATION;
 	
 	public static ShellProcessOperation mLaunchShell;
-	public static void launchMinecraft(final Activity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable {
+    private static int exitCode = 0;
+	public static void launchMinecraft(final LoggableActivity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable {
 		String[] launchArgs = getMinecraftArgs(profile, versionInfo);
 
 		List<String> javaArgList = new ArrayList<String>();
@@ -166,22 +167,24 @@ public final class Tools
 				});
 			*/
 				
-				VMLauncher.launchJVM(javaArgList.toArray(new String[0]));
+				exitCode = VMLauncher.launchJVM(javaArgList.toArray(new String[0]));
+                ctx.appendlnToLog("Java Exit code: " + exitCode);
 			}
 		}
-		
+        
 		ctx.runOnUiThread(new Runnable(){
 				@Override
 				public void run() {
 					AlertDialog.Builder dialog = new AlertDialog.Builder(ctx);
-					dialog.setMessage(R.string.mcn_javaexit_title);
+					dialog.setMessage(ctx.getString(R.string.mcn_exit_title, exitCode));
 					dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
 
 							@Override
 							public void onClick(DialogInterface p1, int p2){
-								ctx.finish();
+								MainActivity.fullyExit();
 							}
 						});
+                    dialog.show();
 				}
 			});
 	}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ba5b607b..65cf73668 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,8 +145,7 @@
 	</string>
 -->
 	<!-- MainActivity: strings -->
-	<string name="mcn_javaexit_title">Application exited</string>
-	<string name="mcn_exit_title">Game exited</string>
+	<string name="mcn_exit_title">Application/Game exited with code %s</string>
 	<string name="mcn_exit_call">Exit</string>
 	<string name="mcn_exit_crash">Game Crash detected! Click OK to exit.</string>
 	<string name="mcn_exit_errcrash">Unable to locate crash! You may ignore this.</string>