From d456317389c77b6a06e07fa8c8d2984bdfccbb95 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Mon, 23 Nov 2020 05:15:13 +0700
Subject: [PATCH] Bug fix: Launch use custom arguments

---
 .../net/kdt/pojavlaunch/BaseLauncherActivity.java     |  1 +
 .../net/kdt/pojavlaunch/JavaGUILauncherActivity.java  | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
index d33db300f..54397edd5 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -114,6 +114,7 @@ public abstract class BaseLauncherActivity extends BaseActivity {
                     @Override
                     public void onClick(DialogInterface di, int i) {
                         Intent intent = new Intent(BaseLauncherActivity.this, JavaGUILauncherActivity.class);
+                        intent.putExtra("skipDetectMod", true);
                         intent.putExtra("javaArgs", edit.getText().toString());
                         startActivity(intent);
                     }
diff --git a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
index 57d860cbe..f4313ffd4 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@@ -21,7 +21,7 @@ public class JavaGUILauncherActivity extends LoggableActivity {
     private File logFile;
     private PrintStream logStream;
 
-    private boolean isLogAllow, mIsCustomInstall;
+    private boolean isLogAllow, mSkipDetectMod;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,8 +54,8 @@ public class JavaGUILauncherActivity extends LoggableActivity {
 
             mTextureView = findViewById(R.id.installmod_surfaceview);
            
-            mIsCustomInstall = getIntent().getExtras().getBoolean("customInstall", false);
-            if (mIsCustomInstall) {
+            mSkipDetectMod = getIntent().getExtras().getBoolean("skipDetectMod", false);
+            if (mSkipDetectMod) {
                 JREUtils.redirectAndPrintJRELog(this, null);
                 new Thread(new Runnable(){
                         @Override
@@ -100,7 +100,7 @@ public class JavaGUILauncherActivity extends LoggableActivity {
     }
 
     public void closeLogOutput(View view) {
-        if (mIsCustomInstall) {
+        if (mSkipDetectMod) {
             forceClose(null);
         } else {
             contentLog.setVisibility(View.GONE);
@@ -119,7 +119,8 @@ public class JavaGUILauncherActivity extends LoggableActivity {
             new ForgeInstaller(installer).install(this);
         } else {
             isLogAllow = false;
-            mIsCustomInstall = false;
+            mSkipDetectMod = true;
+            JREUtils.redirectAndPrintJRELog(this, null);
             launchJavaRuntime(modFile, javaArgs);
         }
     }