diff options
| author |  Brian J. Tarricone | 2020-07-26 00:05:57 -0700 |
|---|---|---|
| committer | Brian J. Tarricone | 2020-07-26 14:54:02 -0700 |
| commit | d840ed90e10f501a3c332cf912e1e74c68a1bde6 (patch) | |
| tree | 729a28b4c2df0287145cdb657b7cce87f6b52c9e /src | |
| parent | Merge pull request #4418 from lioncash/udp-warn (diff) | |
| download | yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.gz yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.xz yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.zip | |
GCAdapter: only join worker thread if running & joinable
Diffstat (limited to 'src')
| -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() { | |||
| 265 | if (adapter_thread_running) { | 265 | if (adapter_thread_running) { |
| 266 | adapter_thread_running = false; | 266 | adapter_thread_running = false; |
| 267 | } | 267 | } |
| 268 | adapter_input_thread.join(); | 268 | if (adapter_input_thread.joinable()) { |
| 269 | adapter_input_thread.join(); | ||
| 270 | } | ||
| 269 | 271 | ||
| 270 | adapter_controllers_status.fill(ControllerTypes::None); | 272 | adapter_controllers_status.fill(ControllerTypes::None); |
| 271 | get_origin.fill(true); | 273 | get_origin.fill(true); |