From 6916fd7384d2f92a210f013165d48debf740ced9 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sat, 13 Jul 2019 13:19:47 +0200
Subject: [PATCH] ensure that executed in EDT

GitOrigin-RevId: b33064d714fc5b8e6b9aa02a3fd8e6f7945b2afa
---
 .../src/com/intellij/platform/ProjectFrameAllocator.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/platform/ProjectFrameAllocator.kt b/platform/platform-impl/src/com/intellij/platform/ProjectFrameAllocator.kt
index 8bc775236159..738ea6490b93 100644
--- a/platform/platform-impl/src/com/intellij/platform/ProjectFrameAllocator.kt
+++ b/platform/platform-impl/src/com/intellij/platform/ProjectFrameAllocator.kt
@@ -80,13 +80,17 @@ internal class ProjectUiFrameAllocator(val options: OpenProjectTask) : ProjectFr
   }
 
   override fun projectCreated(project: Project) {
-    val frame = frame!!
-    (WindowManager.getInstance() as WindowManagerImpl).assignFrame(frame, project)
+    ApplicationManager.getApplication().invokeLater(
+      {
+        if (!project.isDisposed) {
+          (WindowManager.getInstance() as WindowManagerImpl).assignFrame(frame ?: return@invokeLater, project)
+        }
+      }, ModalityState.any())
   }
 
   override fun projectOpened(project: Project) {
     if (options.sendFrameBack) {
-      frame!!.isAutoRequestFocus = true
+      frame?.isAutoRequestFocus = true
     }
   }
 }
\ No newline at end of file