From 242164d428fb4c0de467bac7a97f93bc47305bc8 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 4 Sep 2018 13:00:01 +0300
Subject: [PATCH] fix NPE when there is no application in WelcomeScreen
 (IDEA-CR-36456)

---
 .../intellij/util/concurrency/EdtExecutorServiceImpl.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java b/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
index e48898d41f14..9a40affdfbf8 100644
--- a/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
+++ b/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
@@ -20,7 +20,13 @@ class EdtExecutorServiceImpl extends EdtExecutorService {
 
   @Override
   public void execute(@NotNull Runnable command) {
-    execute(command, ModalityState.any());
+    Application application = ApplicationManager.getApplication();
+    if (application == null) {
+      SwingUtilities.invokeLater(command);
+    }
+    else {
+      execute(command, application.getAnyModalityState());
+    }
   }
 
   @Override