From 8db05ab4a4e4fee326f5d3213ffbe2eebc853a9b Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 27 Oct 2015 13:49:09 +0100
Subject: [PATCH] run post-startup activities in non-modal state to prevent
 assertions if they start dumb mode

---
 .../intellij/openapi/project/impl/ProjectManagerImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index ff328fc1abe3..85c3c24ba90e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -49,6 +49,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.impl.local.FileWatcher;
 import com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl;
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame;
+import com.intellij.ui.GuiUtils;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.TimeoutUtil;
 import com.intellij.util.containers.ContainerUtil;
@@ -383,7 +384,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
 
         startupManager.runPostStartupActivitiesFromExtensions();
 
-        UIUtil.invokeLaterIfNeeded(new Runnable() {
+        GuiUtils.invokeLaterIfNeeded(new Runnable() {
           @Override
           public void run() {
             if (!project.isDisposed()) {
@@ -395,7 +396,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
               }
             }
           }
-        });
+        }, ModalityState.NON_MODAL);
       }
     }, ProjectBundle.message("project.load.progress"), canCancelProjectLoading(), project);