From ffa9347899181aa8ae0741884b331ed6700c115b Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 23 Oct 2014 18:35:18 +0400
Subject: [PATCH] leak

---
 .../openapi/editor/impl/EditorLastActionTrackerImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorLastActionTrackerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorLastActionTrackerImpl.java
index e86e86247610..291becf7be43 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorLastActionTrackerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorLastActionTrackerImpl.java
@@ -22,7 +22,9 @@ import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.EditorLastActionTracker;
-import com.intellij.openapi.editor.event.*;
+import com.intellij.openapi.editor.event.EditorEventMulticaster;
+import com.intellij.openapi.editor.event.EditorMouseEvent;
+import com.intellij.openapi.editor.event.EditorMouseListener;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
@@ -129,7 +131,7 @@ public class EditorLastActionTrackerImpl extends EditorLastActionTracker impleme
       return;
     }
     EditorImpl editorImpl = (EditorImpl)editor;
-    if (editorImpl.replace(DISPOSABLE_SET, null, Boolean.TRUE)) {
+    if (!editorImpl.isDisposed() && editorImpl.replace(DISPOSABLE_SET, null, Boolean.TRUE)) {
       Disposer.register(editorImpl.getDisposable(), new Disposable() {
         @Override
         public void dispose() {