From 91dbfc4cc6e614d4120fb1c5f41c6b605320e68a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 22 Jan 2018 19:38:44 +0000
Subject: [PATCH] Ensure we tidy up progress ticker and callback even if replay
 fails

---
 renderdoc/core/remote_server.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 8742fbd4e..67552cee8 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -452,16 +452,17 @@ static void ActiveRemoteClientThread(ClientThread *threadData,
               remoteDriver->Shutdown();
               remoteDriver = NULL;
             }
-            else
-            {
-              RenderDoc::Inst().SetProgressCallback<LoadProgress>(RENDERDOC_ProgressCallback());
+          }
 
-              kill = true;
-              Threading::JoinThread(ticker);
-              Threading::CloseThread(ticker);
+          RenderDoc::Inst().SetProgressCallback<LoadProgress>(RENDERDOC_ProgressCallback());
 
-              proxy = new ReplayProxy(reader, writer, remoteDriver, replayDriver, previewWindow);
-            }
+          kill = true;
+          Threading::JoinThread(ticker);
+          Threading::CloseThread(ticker);
+
+          if(status == ReplayStatus::Succeeded && remoteDriver)
+          {
+            proxy = new ReplayProxy(reader, writer, remoteDriver, replayDriver, previewWindow);
           }
         }
         else