From b96f0fad5710feffbee76b777a46abd91a1c8be7 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Tue, 2 Jun 2015 00:31:02 +0200 Subject: [PATCH] WiimoteReal: fix multiple Wiimotes on OS X --- Source/Core/Core/HW/WiimoteReal/IOdarwin.mm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index 5c157389ee..253c93b5a2 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -322,11 +322,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal() for (int i = 0; i < MAX_WIIMOTES; i++) { - if (WiimoteReal::g_wiimotes[i] == nullptr) - continue; wm = static_cast(WiimoteReal::g_wiimotes[i]); - if ([device isEqual: wm->m_btd] != TRUE) - wm = nullptr; + if (!wm) + continue; + if ([device isEqual: wm->m_btd]) + break; + wm = nullptr; } if (wm == nullptr) { @@ -361,11 +362,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal() for (int i = 0; i < MAX_WIIMOTES; i++) { - if (WiimoteReal::g_wiimotes[i] == nullptr) - continue; wm = static_cast(WiimoteReal::g_wiimotes[i]); - if ([device isEqual: wm->m_btd] != TRUE) - wm = nullptr; + if (!wm) + continue; + if ([device isEqual: wm->m_btd]) + break; + wm = nullptr; } if (wm == nullptr) {