summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorOatmealDome <julian@oatmealdome.me>2021-07-20 14:56:09 -0400
committerOatmealDome <julian@oatmealdome.me>2021-07-20 14:56:09 -0400
commit48bcd96526b343e9ca9e52de28cfdda4faedf7bd (patch)
tree479d804340509776dd9b3d7f7b44d97278db277b /Source/Core
parentb0d2df727a3ab3455bca30c4d16072a9c9f290dd (diff)
GeckoSockServer: Only join connectionThread if it is joinable
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
index b642590c8a..55058c4e4b 100644
--- 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();