From 576bf32ab29e2292670e34288bffd82414eb8745 Mon Sep 17 00:00:00 2001 From: mimimi085181 Date: Thu, 3 Aug 2017 01:49:47 +0200 Subject: [PATCH] Properly handle g_wiimotes_mutex again for reconnect on button press for real wiimotes Sorry, i overlooked the mutex in PR https://github.com/dolphin-emu/dolphin/pull/4949 This pr fixes issue 10434: https://bugs.dolphin-emu.org/issues/10434 --- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 8df0c29665..55c024f177 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -892,11 +892,13 @@ bool CheckForButtonPress(int wiimote_number) if (!g_wiimotes_mutex.try_lock()) return false; + bool button_pressed = false; + if (g_wiimotes[wiimote_number]) - return g_wiimotes[wiimote_number]->CheckForButtonPress(); + button_pressed = g_wiimotes[wiimote_number]->CheckForButtonPress(); g_wiimotes_mutex.unlock(); - return false; + return button_pressed; } bool IsValidDeviceName(const std::string& name)