From 159d2b1cc332a3f2383efc4502289ff407362bf5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 29 Jan 2019 10:01:35 -0600 Subject: [PATCH] HW/Wiimote: Don't reconnect wiimotes on ChangeWiimoteSource when the source hasn't actually changed. --- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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