From b7795f562d6b147b59f1857a863d133deab542a2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 6 Aug 2017 09:58:30 +0100
Subject: [PATCH] Search up the parent heirarchy for a DockContent

* Fixes a crash debugging a shader that has embedded source available
  (i.e. compiled with D3DCOMPILE_DEBUG).
---
 renderdocui/Windows/ShaderViewer.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 5f63cbb33..ffd0c206b 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -580,7 +580,19 @@ namespace renderdocui.Windows
                     AddFileList();
 
                 if (trace != null || sel == null)
-                    sel = (DockContent)m_DisassemblyView.Parent;
+                {
+                    Control p = m_DisassemblyView.Parent;
+                    while (p != null)
+                    {
+                        if (p is DockContent)
+                        {
+                            sel = (DockContent)p;
+                            break;
+                        }
+
+                        p = p.Parent;
+                    }
+                }
 
                 sel.Show();
             }