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

GCAdapter: only join worker thread if running & joinable
pull/8/head
bunnei 5 years ago committed by GitHub
commit 99d191d80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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