From 63b1ae740d700f24d1de84e8f01ef6d439ff5c1f Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 25 May 2016 11:49:50 +0200 Subject: [PATCH] don't reschedule async editor loading when the file editor or project is disposed --- .../openapi/fileEditor/impl/text/AsyncEditorLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java index 64d51d6c1cbd..068e38b3f9f7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java @@ -91,7 +91,9 @@ public class AsyncEditorLoader { @Override public void onCanceled(@NotNull ProgressIndicator indicator) { - scheduleBackgroundLoading(false); + if (!Disposer.isDisposed(myTextEditor) || myProject.isDisposed()) { + scheduleBackgroundLoading(false); + } } };