From 8580a997287d297c67384ad6a9a77ff25bf2f4e0 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sun, 29 Jul 2012 23:46:52 -0400
Subject: [PATCH] Fix window sticking around - it doesn't anymore

---
 .../fml/relauncher/FMLEmbeddingRelauncher.java    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java b/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
index 98230afbb7..9ac08d5538 100644
--- a/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
+++ b/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
@@ -78,8 +78,11 @@ public class FMLEmbeddingRelauncher
         }
         finally
         {
-            popupWindow.setVisible(false);
-            popupWindow.dispose();
+            if (popupWindow!=null)
+            {
+                popupWindow.setVisible(false);
+                popupWindow.dispose();
+            }
         }
 
         try
@@ -182,6 +185,14 @@ public class FMLEmbeddingRelauncher
         {
             throw new RuntimeException(e);
         }
+        finally
+        {
+            if (popupWindow!=null)
+            {
+                popupWindow.setVisible(false);
+                popupWindow.dispose();
+            }
+        }
     }
 
     public static void appletStart(Applet applet)