From 6449013904fd644f47f789f623f5cc4008e9d6f2 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 12 Jun 2019 17:35:45 +0200 Subject: [PATCH] Don't schedule background post-startup activities if project has already been disposed (IDEA-CR-48118) GitOrigin-RevId: fd382465106884b782965de73a99055386162c69 --- .../com/intellij/openapi/project/impl/ProjectManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 09e8410f14d9..e77b06481673 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 @@ -429,7 +429,9 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable { ? LoadingPhase.PROJECT_OPENED : LoadingPhase.INDEXING_FINISHED); - startupManager.scheduleBackgroundPostStartupActivities(); + if (!project.isDisposed()) { + startupManager.scheduleBackgroundPostStartupActivities(); + } }, ModalityState.NON_MODAL); }));