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.
dolphin-emu · Jun 26, 2015 · cff6d9f · cff6d9f
2 parents 6818f2e + 716c542
commit cff6d9f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -485,9 +485,12 @@ void WiimoteScanner::ThreadFunc()
 
 bool Wiimote::Connect()
 {
-	m_thread_ready.store(false);
-	StartThread();
-	WaitReady();
+	if (!m_run_thread.load())
+	{
+		m_thread_ready.store(false);
+		StartThread();
+		WaitReady();
+	}
 	return IsConnected();
 }