Fixed infinite-recursion

HMCL-dev · Mar 4, 2016 · 1818b35 · 1818b35
1 parent afde411
commit 1818b35
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java b/...main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java
@@ -31,9 +31,7 @@
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.launcher.core.MCUtils;
-import org.jackhuang.hellominecraft.util.tasks.DecompressTask;
 import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.util.StrUtils;

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java
@@ -124,8 +124,10 @@ void makeLaunchScript(Profile profile) {
     };
 
     private static void checkExit(LauncherVisibility v) {
-        if (v != LauncherVisibility.KEEP && !LogWindow.INSTANCE.isVisible())
+        if (v != LauncherVisibility.KEEP && !LogWindow.INSTANCE.isVisible()) {
+            HMCLog.log("Launcher will exit now.");
             System.exit(0);
+        }
     }
 
     private static final Event<List<String>> LAUNCH_SCRIPT_FINISHER = (sender, str) -> {

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java
@@ -48,7 +48,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("MessageBox", "");
             put("AWTError", "");
             put("JFileChooser", "Has your operating system been installed completely or is a ghost system? ");
-            put("JceSecurityManager", "Has your operating system been installed completely or is a ghost system? ");
+            put("JceSecurity", "Has your operating system been installed completely or is a ghost system? ");
             put("couldn't create component peer", "Fucking computer!");
             put("sun.awt.shell.Win32ShellFolder2", "crash.user_fault");
             put("UnsatisfiedLinkError", "crash.user_fault");

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java
@@ -67,6 +67,12 @@ public HMCLMinecraftService(Profile p) {
     }
 
     private void checkModpack() {
+        int show = 0;
+        for (StackTraceElement e : Thread.currentThread().getStackTrace())
+            if ("checkModpack".equals(e.getMethodName()))
+                ++show;
+        if (show > 2)
+            return;
         if (version().getVersionCount() == 0) {
             File modpack = new File("modpack.zip");
             if (modpack.exists()) {