From 0ddfd3d65bfb26f18bf9ccd48acbafea056d667b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 23 Aug 2016 13:47:06 +0200
Subject: [PATCH] Shut down active client properly when killing remote server

---
 renderdoc/core/remote_server.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 09b8c1c0b..f20d90518 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -676,8 +676,10 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
     }
   }
 
-  if(activeClientData && activeClientData->socket == NULL)
+  if(activeClientData && activeClientData->socket != NULL)
   {
+    activeClientData->killThread = true;
+
     Threading::JoinThread(activeClientData->thread);
     Threading::CloseThread(activeClientData->thread);