From 416cac675bd66cfa1f66c7a360831ee5d3f7590d Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 13 Aug 2012 22:12:36 -0400 Subject: [PATCH] Actually fix the applet launch - it now launches properly *and* closes the window --- .../cpw/mods/fml/relauncher/FMLRelauncher.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java index 7c40be82ff..a3750ce71b 100644 --- a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java +++ b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java @@ -65,6 +65,10 @@ public class FMLRelauncher } private void showWindow(boolean showIt) { + if (RelaunchLibraryManager.downloadMonitor!=null) + { + return; + } try { RelaunchLibraryManager.downloadMonitor = new Downloader(); @@ -196,6 +200,11 @@ public class FMLRelauncher appletClass = ReflectionHelper.getClass(classLoader, "net.minecraft.client.MinecraftApplet"); if (minecraftApplet.getClass().getClassLoader() == classLoader) { + if (popupWindow!=null) + { + popupWindow.setVisible(false); + popupWindow.dispose(); + } try { newApplet = minecraftApplet; @@ -254,6 +263,11 @@ public class FMLRelauncher { if (applet.getClass().getClassLoader() == classLoader) { + if (popupWindow!=null) + { + popupWindow.setVisible(false); + popupWindow.dispose(); + } try { ReflectionHelper.findMethod(appletClass, newApplet, new String[] {"fmlStartReentry"}).invoke(newApplet);