From d98b4c0f977f8386c8238ba33e028cf13dbb13c6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 26 Aug 2016 17:04:31 +0200
Subject: [PATCH] Fix potential crash if timer check/probe is happening during
 shutdown

---
 renderdocui/Windows/MainWindow.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/renderdocui/Windows/MainWindow.cs b/renderdocui/Windows/MainWindow.cs
index 5fba52b94..44ab353fd 100644
--- a/renderdocui/Windows/MainWindow.cs
+++ b/renderdocui/Windows/MainWindow.cs
@@ -291,6 +291,9 @@ namespace renderdocui.Windows
 
             var me = (MainWindow)m;
 
+            if (!me.Created || me.IsDisposed)
+                return;
+
             // perform a probe of known remote hosts to see if they're running or not
             if (!me.m_Core.LogLoading && !me.m_Core.LogLoaded)
             {
@@ -368,8 +371,14 @@ namespace renderdocui.Windows
                 if (me.m_Core.Renderer.Remote != null)
                     me.m_Core.Renderer.PingRemote();
 
+                if(!me.Created || me.IsDisposed)
+                    return;
+
                 me.BeginInvoke(new Action(() =>
                 {
+                    if (!me.Created || me.IsDisposed)
+                        return;
+
                     if (me.m_Core.Renderer.Remote != null && !me.m_Core.Renderer.Remote.ServerRunning)
                     {
                         me.contextChooser.Image = global::renderdocui.Properties.Resources.cross;