diff options
| author | JMC47 <JMC4789@gmail.com> | 2021-07-20 22:18:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 22:18:33 -0400 |
| commit | b515786c8dd94aac73e59003d9c232bd319ae1bd (patch) | |
| tree | 8de7d628c707f16ce6f0f5d8965c0309f979cf82 /Source/Core | |
| parent | 175878cad855fc792398ff7d303ff3fbc0d50cea (diff) | |
| parent | 48bcd96526b343e9ca9e52de28cfdda4faedf7bd (diff) | |
Merge pull request #9927 from OatmealDome/double-usbgecko
GeckoSockServer: Only join connectionThread if it is joinable
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp | 2 |
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(); |