Merge pull request #9927 from OatmealDome/double-usbgecko

GeckoSockServer: Only join connectionThread if it is joinable
dolphin-emu · Jul 21, 2021 · b515786 · b515786
2 parents 175878c + 48bcd96
commit b515786
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
@@ -43,7 +43,7 @@ GeckoSockServer::~GeckoSockServer()
     clientThread.join();
   }
 
-  if (client_count <= 0)
+  if (client_count <= 0 && connectionThread.joinable())
   {
     server_running.Clear();
     connectionThread.join();