From 3bd41d238e0217eb7fd3e0efd856675cb2798d20 Mon Sep 17 00:00:00 2001
From: Denis Fokin <Denis.Fokin@jetbrains.com>
Date: Fri, 16 Sep 2016 11:13:45 +0300
Subject: [PATCH] LaterInvocatorTest.testStress failure investigation

---
 .../com/intellij/openapi/application/impl/LaterInvocator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/LaterInvocator.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/LaterInvocator.java
index 1322ffaba79d..1377942dce09 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/LaterInvocator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/LaterInvocator.java
@@ -299,7 +299,7 @@ public class LaterInvocator {
 
   public static Object[] getCurrentModalEntitiesForProject(Project project) {
     ApplicationManager.getApplication().assertIsDispatchThread();
-    if (ourModalEntities.isEmpty()) {
+    if (project == null || !ourModalEntities.isEmpty()) {
       return ArrayUtil.toObjectArray(ourModalEntities);
     }
     return ArrayUtil.toObjectArray(projectToModalEntities.get(project));