diff options
| author | bunnei <bunneidev@gmail.com> | 2020-07-27 03:03:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 03:03:37 +0200 |
| commit | 99d191d80dd94bb398848246b7b13aa925a70a91 (patch) | |
| tree | e6ef6479353a5bc84fe12a61819a0c46878cdb50 | |
| parent | Merge pull request #4426 from lioncash/lock (diff) | |
| parent | GCAdapter: only join worker thread if running & joinable (diff) | |
| download | yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar.gz yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar.bz2 yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar.lz yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar.xz yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.tar.zst yuzu-99d191d80dd94bb398848246b7b13aa925a70a91.zip | |
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 29ea1f2c7..74759ea7d 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/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); |