Browse Source

GCAdapter: only join worker thread if running & joinable

pull/15/merge
Brian J. Tarricone 5 years ago
parent
commit
d840ed90e1
  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) { if (adapter_thread_running) {
adapter_thread_running = false; adapter_thread_running = false;
} }
adapter_input_thread.join();
if (adapter_input_thread.joinable()) {
adapter_input_thread.join();
}
adapter_controllers_status.fill(ControllerTypes::None); adapter_controllers_status.fill(ControllerTypes::None);
get_origin.fill(true); get_origin.fill(true);

Loading…
Cancel
Save