--- a/Viewer.py	Thu Feb 02 16:12:26 2012 +0100
+++ b/Viewer.py	Tue Feb 07 19:12:25 2012 +0100
@@ -540,7 +540,7 @@
         self.Editor.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheelWindow)
         self.Editor.Bind(wx.EVT_SIZE, self.OnMoveWindow)
         self.Editor.Bind(wx.EVT_MOUSE_EVENTS, self.OnViewerMouseEvent)
-    
+        
     def __del__(self):
         DebugViewer.__del__(self)
         self.RefreshHighlightsTimer.Stop()
@@ -910,6 +910,10 @@
     def RefreshView(self, variablepanel=True, selection=None):
         EditorPanel.RefreshView(self, variablepanel)
         
+        if self.ToolTipElement is not None:
+            self.ToolTipElement.ClearToolTip()
+            self.ToolTipElement = None
+        
         self.Inhibit(True)
         self.current_id = 0
         # Start by reseting Viewer
@@ -1423,7 +1427,7 @@
                 tooltip_pos.y += 10
                 self.ToolTipElement.CreateToolTip(tooltip_pos)
         event.Skip()
-
+    
     def OnViewerLeftDown(self, event):
         if self.Mode == MODE_SELECTION:
             dc = self.GetLogicalDC()