Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.git

Update from idea/138.538 to idea/138.1029

Change-Id: I828f829a968439a99ec67640990c18ff7c9b58ce

1 files changed, 9 insertions, 1 deletions

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
index 9fed59c966b0..0065a2843aac 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
@@ -65,6 +65,7 @@ public class ExecutionPointHighlighter {
 
         mySourcePosition = position;
 
+        clearDescriptor();
         myOpenFileDescriptor = XSourcePositionImpl.createOpenFileDescriptor(myProject, position);
         //see IDEA-125645 and IDEA-63459
         //myOpenFileDescriptor.setUseCurrentWindow(true);
@@ -84,13 +85,20 @@ public class ExecutionPointHighlighter {
         updateRequested.set(false);
 
         removeHighlighter();
-        myOpenFileDescriptor = null;
+        clearDescriptor();
         myEditor = null;
         myGutterIconRenderer = null;
       }
     });
   }
 
+  private void clearDescriptor() {
+    if (myOpenFileDescriptor != null) {
+      myOpenFileDescriptor.dispose();
+      myOpenFileDescriptor = null;
+    }
+  }
+
   public void navigateTo() {
     if (myOpenFileDescriptor != null) {
       myOpenFileDescriptor.navigateInEditor(myProject, true);