run post-startup activities in non-modal state to prevent assertions if they start dumb mode

This commit is contained in:
peter
2015-10-27 14:46:50 +01:00
parent c1f0d70d1f
commit 8db05ab4a4
@@ -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);