Merge pull request #1143 from lioncash/exi

Core: Fix SIGABRT possibility in EXI_DeviceGecko
2014-09-22 00:16:34 -07:00 · 2014-09-22 00:16:34 -07:00 · c617f324b2
parent 6379d3983a 858d18a67e
commit c617f324b2
1 changed files with 4 additions and 2 deletions
--- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp
@ -23,10 +23,12 @@ GeckoSockServer::GeckoSockServer()
 GeckoSockServer::~GeckoSockServer()
 {
 	if (clientThread.joinable())
+	{
 		--client_count;

-	client_running = false;
-	clientThread.join();
+		client_running = false;
+		clientThread.join();
+	}

 	if (client_count <= 0)
 	{