summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-01-29 10:01:35 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2019-01-29 10:01:35 -0600
commit159d2b1cc332a3f2383efc4502289ff407362bf5 (patch)
tree82b76afe4ff17802e3babc4af76951bb0843d06a /Source/Core
parent0e1669e1c7adef2fa5ef0db402b71c0f5c1f0dc4 (diff)
HW/Wiimote: Don't reconnect wiimotes on ChangeWiimoteSource when the source hasn't actually changed.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index b6a7232987..2a33321a53 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -768,6 +768,13 @@ void Pause()
void ChangeWiimoteSource(unsigned int index, int source)
{
const int previous_source = g_wiimote_sources[index];
+
+ if (previous_source == source)
+ {
+ // No change. Do nothing.
+ return;
+ }
+
g_wiimote_sources[index] = source;
{
// kill real connection (or swap to different slot)
@@ -919,4 +926,4 @@ bool IsNewWiimote(const std::string& identifier)
return s_known_ids.count(identifier) == 0;
}
-}; // end of namespace
+}; // namespace WiimoteReal