From caad5235ffa8a7258d76baa745daf19cad9f5f87 Mon Sep 17 00:00:00 2001 From: "andrey.zaytsev" Date: Tue, 30 Apr 2013 17:34:30 +0400 Subject: [PATCH] fix NPE's --- .../find/impl/livePreview/LivePreviewController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java index ee54afdc4e6b..b85867b11b4c 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java +++ b/platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java @@ -299,11 +299,12 @@ public class LivePreviewController implements LivePreview.Delegate, FindUtil.Rep } public void dispose() { - off(); if (myDisposed) return; - mySearchResults.dispose(); myLivePreview.cleanUp(); + off(); + + mySearchResults.dispose(); getEditor().getDocument().removeDocumentListener(myDocumentListener); myDisposed = true; } @@ -325,6 +326,7 @@ public class LivePreviewController implements LivePreview.Delegate, FindUtil.Rep public void off() { if (myDisposed) return; + setTrackingDocument(false); setLivePreview(null); setTrackingSelection(false); }