From d8bc653edb34c83adc6343b18d1e1b00c8428b91 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 6 Apr 2015 15:16:53 +0100 Subject: [PATCH] Fix infinite loop toggling breakpoint * Also we don't set the custom assembly context menu when there is no trace to debug. --- renderdocui/Windows/ShaderViewer.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs index 9cbe3cf38..9ffb729af 100644 --- a/renderdocui/Windows/ShaderViewer.cs +++ b/renderdocui/Windows/ShaderViewer.cs @@ -287,7 +287,7 @@ namespace renderdocui.Windows { var line = sc.Lines.FromPosition(position); - while (line != null) + while (line != null && line.StartPosition >= 0) { var trimmed = line.Text.Trim(); @@ -445,8 +445,11 @@ namespace renderdocui.Windows BreakpointMarkers.Add(BREAKPOINT_MARKER); BreakpointMarkers.Add(BREAKPOINT_MARKER + 1); - m_DisassemblyView.ContextMenu = AssemblyContextMenu(); - m_DisassemblyView.MouseDown += new MouseEventHandler(contextMouseDown); + if (trace != null) + { + m_DisassemblyView.ContextMenu = AssemblyContextMenu(); + m_DisassemblyView.MouseDown += new MouseEventHandler(contextMouseDown); + } m_Scintillas.Add(m_DisassemblyView);