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 #2640 from AdmiralCurtiss/real-wiimote-crash-fix 

WiimoteReal: Fix crash when switching a real Wiimote to a different slot or type during emulation.
This commit is contained in:
Jules Blok 2015-06-26 20:33:50 +02:00
parent 6818f2e092 716c54217a
commit cff6d9f922
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -485,9 +485,12 @@ void WiimoteScanner::ThreadFunc()
bool Wiimote::Connect() bool Wiimote::Connect()
{ {
m_thread_ready.store(false); if (!m_run_thread.load())
StartThread(); {
WaitReady(); m_thread_ready.store(false);
StartThread();
WaitReady();
}
return IsConnected(); return IsConnected();
} }