Fix race between texture viewer creating its thumbnails & first use

baldurk · Mar 3, 2015 · 8fa5eb7 · 8fa5eb7
1 parent 05fd837
commit 8fa5eb7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
@@ -741,6 +741,9 @@ public void OnLogfileLoaded()
 
             m_Following = new Following(FollowType.OutputColour, 0);
 
+            rtPanel.ClearThumbnails();
+            texPanel.ClearThumbnails();
+
             IntPtr contextHandle = pixelContext.Handle;
             IntPtr renderHandle = render.Handle;
             m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
@@ -876,6 +879,8 @@ public void OnEventSelected(UInt32 frameID, UInt32 eventID)
 
             if (m_Output == null) return;
 
+            UI_CreateThumbnails();
+
             int i = 0;
             for(int rt=0; rt < RTs.Length; rt++)
             {
@@ -1168,6 +1173,8 @@ public void OnEventSelected(UInt32 frameID, UInt32 eventID)
 
         private void UI_CreateThumbnails()
         {
+            if (rtPanel.Thumbnails.Length > 0 || texPanel.Thumbnails.Length > 0) return;
+
             rtPanel.SuspendLayout();
             texPanel.SuspendLayout();