From e79c98c85a586339379fce9ea1f0591b99079665 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 7 Jul 2015 17:38:52 +0200
Subject: [PATCH] Fix crash if tooltip is still open when watch variable is
 deleted

---
 renderdocui/Windows/ShaderViewer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 2b4f52eb3..a5b8a028e 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -918,9 +918,9 @@ namespace renderdocui.Windows
 
             ListView list = sender as ListView;
 
-            if (m_HoverItem != null)
+            if (m_HoverItem != null && m_HoverItem.ListView != null)
                 variableHover.Hide(m_HoverItem.ListView);
-            if (m_HoverNode != null)
+            if (m_HoverNode != null && m_HoverNode.OwnerView != null)
                 variableHover.Hide(m_HoverNode.OwnerView);
 
             hoverTimer.Enabled = false;