Parcourir la source

Merge pull request #4431 from kelnos/fix-exit-crash

GCAdapter: only join worker thread if running & joinable
bunnei il y a 6 ans
Parent
commit
99d191d80d
1 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 3 1
      src/input_common/gcadapter/gc_adapter.cpp

+ 3 - 1
src/input_common/gcadapter/gc_adapter.cpp

@@ -265,7 +265,9 @@ void Adapter::Reset() {
     if (adapter_thread_running) {
         adapter_thread_running = false;
     }
-    adapter_input_thread.join();
+    if (adapter_input_thread.joinable()) {
+        adapter_input_thread.join();
+    }
 
     adapter_controllers_status.fill(ControllerTypes::None);
     get_origin.fill(true);