From 316a3bc0d83887190b93cccbdcedb92fb7fbf202 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 20 Jun 2019 16:22:28 +0300
Subject: [PATCH] add safeguards against sudden project close

GitOrigin-RevId: 5be4de04f6fb2d49db4fc10af2da5ff138949825
---
 .../memory/ui/ExpressionEditorWithHistory.java         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java
index 71931b68a94d..8122b2c2657d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java
@@ -50,10 +50,12 @@ class ExpressionEditorWithHistory extends XDebuggerExpressionEditor {
 
     ApplicationManager.getApplication().executeOnPooledThread(()->
       ApplicationManager.getApplication().runReadAction(() -> {
-        final PsiClass psiClass = DebuggerUtils.findClass(className,
-                                                          project, GlobalSearchScope.allScope(project));
-        ApplicationManager.getApplication().invokeLater(() -> setContext(psiClass));
-    }));
+        if (!project.isDisposed()) {
+          final PsiClass psiClass = DebuggerUtils.findClass(className,
+                                                            project, GlobalSearchScope.allScope(project));
+          ApplicationManager.getApplication().invokeLater(() -> setContext(psiClass), project.getDisposed());
+        }
+      }));
   }
 
   private void showHistory() {