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

GCAdapter: only join worker thread if running & joinable
2020-07-26 18:03:37 -07:00 · 2020-07-26 18:03:37 -07:00 · 99d191d80d
parent 08f02836d8 d840ed90e1
commit 99d191d80d
1 changed files with 3 additions and 1 deletions
--- a/src/input_common/gcadapter/gc_adapter.cpp
+++ b/src/input_common/gcadapter/gc_adapter.cpp
@ -265,7 +265,9 @@ void Adapter::Reset() {
    if (adapter_thread_running) {
        adapter_thread_running = false;
    }
+    if (adapter_input_thread.joinable()) {
        adapter_input_thread.join();
+    }

    adapter_controllers_status.fill(ControllerTypes::None);
    get_origin.fill(true);