From 862b62df424716badc3dd529e9cdc07ec2aa8d1f Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Thu, 19 Jul 2018 18:37:16 +0300 Subject: [PATCH] IDEA-194957 NPE on closing Project in IntelliJ IDEA --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 270591ac0ee2..948782ef2a21 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -946,7 +946,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi myEditorComponent.removeMouseMotionListener(myMouseMotionListener); myGutterComponent.removeMouseMotionListener(myMouseMotionListener); - CodeStyleSettingsManager.getInstance(myProject).removeListener(this); + if (myProject == null || !myProject.isDisposed()) { + CodeStyleSettingsManager.getInstance(myProject).removeListener(this); + } if (myBulkUpdateListener != null) { ((DocumentImpl)myDocument).removeInternalBulkModeListener(myBulkUpdateListener);