yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

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

GCAdapter: only join worker thread if running & joinable
This commit is contained in:
bunnei 2020-07-26 18:03:37 -07:00 committed by GitHub
parent 08f02836d8 d840ed90e1
commit 99d191d80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input_common/gcadapter/gc_adapter.cpp
View File

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