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

Fix sloppy connection logic.

This commit is contained in:
Jordan Woyak 2013-02-12 18:56:36 -06:00
parent 12674b3164
commit 7f305ba822
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -478,15 +478,14 @@ void TryToConnectWiimote(Wiimote* wm)
for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
{ {
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
&& !g_wiimotes[i] && !g_wiimotes[i])
&& wm->Connect()
&& wm->Prepare(i))
{ {
g_wiimotes[i] = wm; if (wm->Connect() && wm->Prepare(i))
{
wm->StartThread(); g_wiimotes[i] = wm;
wm->StartThread();
wm = NULL; wm = NULL;
}
break; break;
} }
} }
@ -508,11 +507,13 @@ void DoneWithWiimote(int index)
for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
{ {
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
&& !g_wiimotes[i] && !g_wiimotes[i])
&& g_wiimotes[index]->Prepare(i))
{ {
std::swap(g_wiimotes[i], g_wiimotes[index]); if (g_wiimotes[index]->Prepare(i))
g_wiimotes[i]->StartThread(); {
std::swap(g_wiimotes[i], g_wiimotes[index]);
g_wiimotes[i]->StartThread();
}
break; break;
} }
} }