Browse Source
Merge pull request #4431 from kelnos/fix-exit-crash
GCAdapter: only join worker thread if running & joinable
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
1 deletions
-
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); |
|
|
|
|