ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2500 from Tilka/osx_wiimotes 

WiimoteReal: fix multiple Wiimotes on OS X
This commit is contained in:
flacs 2015-06-02 05:03:15 +02:00
parent d36df5b1b4 b96f0fad57
commit 426f33c408
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
View File

@ -322,11 +322,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
for (int i = 0; i < MAX_WIIMOTES; i++) for (int i = 0; i < MAX_WIIMOTES; i++)
{ {
if (WiimoteReal::g_wiimotes[i] == nullptr)
continue;
wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]); wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]);
if ([device isEqual: wm->m_btd] != TRUE) if (!wm)
wm = nullptr; continue;
if ([device isEqual: wm->m_btd])
break;
wm = nullptr;
} }
if (wm == nullptr) { if (wm == nullptr) {
@ -361,11 +362,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
for (int i = 0; i < MAX_WIIMOTES; i++) for (int i = 0; i < MAX_WIIMOTES; i++)
{ {
if (WiimoteReal::g_wiimotes[i] == nullptr)
continue;
wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]); wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]);
if ([device isEqual: wm->m_btd] != TRUE) if (!wm)
wm = nullptr; continue;
if ([device isEqual: wm->m_btd])
break;
wm = nullptr;
} }
if (wm == nullptr) { if (wm == nullptr) {