From 48bcd96526b343e9ca9e52de28cfdda4faedf7bd Mon Sep 17 00:00:00 2001
From: OatmealDome <julian@oatmealdome.me>
Date: Tue, 20 Jul 2021 14:56:09 -0400
Subject: [PATCH] GeckoSockServer: Only join connectionThread if it is joinable

---
 Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();