From b91518a2aa766203bf64f4242f083567534e16d1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 25 Jul 2016 17:57:13 +0200 Subject: [PATCH] Prevent a crash when reloading layout, if bufferviewer is destroyed --- renderdocui/Windows/BufferViewer.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs index 22230e12d..3e8dcd6fb 100644 --- a/renderdocui/Windows/BufferViewer.cs +++ b/renderdocui/Windows/BufferViewer.cs @@ -482,6 +482,8 @@ namespace renderdocui.Windows public void OnLogfileClosed() { + if (IsDisposed) return; + m_Output = null; ResetConfig(); @@ -603,6 +605,8 @@ namespace renderdocui.Windows public void OnEventSelected(UInt32 eventID) { + if (IsDisposed) return; + // ignore OnEventSelected until we've loaded if (!m_Loaded) return;