From 9f1abf7a90a58777df39dc1fe480fc67fac0273a Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 19 Sep 2013 11:16:21 +0200
Subject: [PATCH] nosplash shouldn't prevent from plugin update

---
 platform/bootstrap/src/com/intellij/ide/Bootstrap.java        | 4 +++-
 platform/platform-impl/src/com/intellij/idea/StartupUtil.java | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/bootstrap/src/com/intellij/ide/Bootstrap.java b/platform/bootstrap/src/com/intellij/ide/Bootstrap.java
index ff6693c244c5..847062c47e5e 100644
--- a/platform/bootstrap/src/com/intellij/ide/Bootstrap.java
+++ b/platform/bootstrap/src/com/intellij/ide/Bootstrap.java
@@ -24,11 +24,13 @@ import java.lang.reflect.Method;
  */
 public class Bootstrap {
   private static final String PLUGIN_MANAGER = "com.intellij.ide.plugins.PluginManager";
+  public static final String NO_SPLASH = "nosplash";
 
   private Bootstrap() { }
 
   public static void main(String[] args, String mainClass, String methodName) throws Exception {
-    UrlClassLoader newClassLoader = BootstrapClassLoaderUtil.initClassLoader(args.length == 0);
+    UrlClassLoader newClassLoader = BootstrapClassLoaderUtil.initClassLoader(args.length == 0 || args.length == 1 &&
+                                                                                                 NO_SPLASH.equals(args[0]));
 
     WindowsCommandLineProcessor.ourMirrorClass = Class.forName(WindowsCommandLineProcessor.class.getName(), true, newClassLoader);
 
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 46ca05d4f0d1..87f1b23c549f 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.idea;
 
+import com.intellij.ide.Bootstrap;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.application.ConfigImportHelper;
@@ -45,7 +46,7 @@ import java.util.List;
  * @author yole
  */
 public class StartupUtil {
-  @NonNls public static final String NO_SPLASH = "nosplash";
+  @NonNls public static final String NO_SPLASH = Bootstrap.NO_SPLASH;
 
   private static SocketLock ourLock;
   private static String myDefaultLAF;