summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorBrian J. Tarricone <brian@tarricone.org>2020-07-26 09:05:57 +0200
committerBrian J. Tarricone <brian@tarricone.org>2020-07-26 23:54:02 +0200
commitd840ed90e10f501a3c332cf912e1e74c68a1bde6 (patch)
tree729a28b4c2df0287145cdb657b7cce87f6b52c9e /src/input_common
parentMerge pull request #4418 from lioncash/udp-warn (diff)
downloadyuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.gz
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.bz2
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.lz
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.xz
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.tar.zst
yuzu-d840ed90e10f501a3c332cf912e1e74c68a1bde6.zip
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/gcadapter/gc_adapter.cpp4
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);