From 8df2e86805658ecdd2ffc70edf19fb0828a7d902 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 19 Jul 2015 13:47:41 +0200
Subject: [PATCH] When selecting a bookmark, skip over labels

---
 renderdocui/Windows/EventBrowser.cs | 32 ++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs
index c13cedc688..43bceae296 100644
--- a/renderdocui/Windows/EventBrowser.cs
+++ b/renderdocui/Windows/EventBrowser.cs
@@ -456,12 +456,30 @@ private bool FindEventNode(ref TreelistView.Node found, TreelistView.NodeCollect
             return false;
         }
 
+        private bool FindEventNode(ref TreelistView.Node found, UInt32 frameID, UInt32 eventID)
+        {
+            bool ret = FindEventNode(ref found, eventView.Nodes[0].Nodes, frameID, eventID);
+
+            while (found != null && found.NextSibling != null && found.NextSibling.Tag is DeferredEvent)
+            {
+                DeferredEvent def = found.NextSibling.Tag as DeferredEvent;
+
+                if (def.eventID == eventID)
+                    found = found.NextSibling;
+                else
+                    break;
+            }
+
+            return ret;
+        }
+
         private bool SelectEvent(UInt32 frameID, UInt32 eventID)
         {
             if (eventView.Nodes.Count == 0) return false;
 
             TreelistView.Node found = null;
-            FindEventNode(ref found, eventView.Nodes[0].Nodes, frameID, eventID);
+            FindEventNode(ref found, frameID, eventID);
+
             if (found != null)
             {
                 eventView.FocusedNode = found;
@@ -1053,17 +1071,7 @@ private void ToggleBookmark(UInt32 EID)
             int index = m_Bookmark.IndexOf(EID);
 
             TreelistView.Node found = null;
-            FindEventNode(ref found, eventView.Nodes[0].Nodes, m_Core.CurFrame, EID);
-
-            while (found.NextSibling != null && found.NextSibling.Tag is DeferredEvent)
-            {
-                DeferredEvent def = found.NextSibling.Tag as DeferredEvent;
-
-                if (def.eventID == EID)
-                    found = found.NextSibling;
-                else
-                    break;
-            }
+            FindEventNode(ref found, m_Core.CurFrame, EID);
 
             if (index >= 0)
             {