From c0979014ac73de08c8d635de6bd9476ef6527f4d Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Thu, 21 Feb 2013 19:19:28 +0400
Subject: [PATCH] hide splash when welcome screen is shown

---
 .../com/intellij/idea/IdeaApplication.java    | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
index 8ebdb3980038..5dd2c2f5a3b9 100644
--- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
@@ -37,10 +37,7 @@ import com.intellij.openapi.updateSettings.impl.UpdateChecker;
 import com.intellij.openapi.updateSettings.impl.UpdateSettings;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.openapi.wm.WindowManager;
-import com.intellij.openapi.wm.WindowManagerListener;
-import com.intellij.openapi.wm.ex.WindowManagerEx;
 import com.intellij.openapi.wm.impl.WindowManagerImpl;
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame;
 import com.intellij.ui.Splash;
@@ -83,6 +80,7 @@ public class IdeaApplication {
     }
     else {
       patchSystem();
+      new JFrame(); // this peer will prevent shutting down our application
       Splash splash = null;
       if (myArgs.length == 0) {
         myStarter = getStarter();
@@ -276,22 +274,7 @@ public class IdeaApplication {
       // application components. So it is proper to perform replacement only here.
       ApplicationEx app = ApplicationManagerEx.getApplicationEx();
       // app.setupIdeQueue(IdeEventQueue.getInstance());
-      final WindowManagerEx windowManager = (WindowManagerEx)WindowManager.getInstance();
-      WindowManagerListener splashDisposer = new WindowManagerListener() {
-        @Override
-        public void frameCreated(IdeFrame frame) {
-          if (mySplash != null) {
-            mySplash.dispose();
-            mySplash = null; // Allow GC collect the splash window
-          }
-          windowManager.removeListener(this);
-        }
-
-        @Override
-        public void beforeFrameReleased(IdeFrame frame) {}
-      };
-
-      windowManager.addListener(splashDisposer);
+      WindowManagerImpl windowManager = (WindowManagerImpl)WindowManager.getInstance();
 
       try {
         IdeEventQueue.getInstance().setWindowManager(windowManager);
@@ -304,10 +287,9 @@ public class IdeaApplication {
         if (!willOpenProject.get()) {
           WelcomeFrame.showNow();
           lifecyclePublisher.welcomeScreenDisplayed();
-          splashDisposer.frameCreated(null);
         }
         else {
-          ((WindowManagerImpl)windowManager).showFrame();
+          windowManager.showFrame();
         }
       }
       catch (PluginException e) {
@@ -317,6 +299,16 @@ public class IdeaApplication {
         System.exit(-1);
       }
 
+      app.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          if (mySplash != null) {
+            mySplash.dispose();
+            mySplash = null; // Allow GC collect the splash window
+          }
+        }
+      }, ModalityState.NON_MODAL);
+
       app.invokeLater(new Runnable() {
         @Override
         public void run() {