Browse Source

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

GCAdapter: only join worker thread if running & joinable
nce_cpp
bunnei 5 years ago
committed by GitHub
parent
commit
d9f73562d8
  1. 4
      src/input_common/gcadapter/gc_adapter.cpp

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

Loading…
Cancel
Save