Merge branch 'join-wiimote-scanning-thread'

3 files changed, 8 insertions, 5 deletions

diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
index 0bf10b343d..2061e80f2e 100644
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -32,7 +32,7 @@ void Shutdown()
 		delete *i;
 	g_plugin.controllers.clear();
 
-	WiimoteReal::Shutdown();
+	WiimoteReal::Stop();
 
 	g_controller_interface.Shutdown();
 }
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index 04c09c5ab5..be1de18bc9 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -54,6 +54,7 @@ namespace WiimoteReal
 {
 
 void Initialize(bool wait = false);
+void Stop();
 void Shutdown();
 void Resume();
 void Pause();
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index b5297d8655..d2e7e2f57a 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -570,15 +570,17 @@ void Initialize(bool wait)
 	g_real_wiimotes_initialized = true;
 }
 
-void Shutdown(void)
+// called on emulation shutdown
+void Stop(void)
 {
 	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
 		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
 			g_wiimotes[i]->EmuStop();
+}
 
-	// WiimoteReal is shutdown on app exit
-	return;
-
+// called when the dolphin app exits
+void Shutdown(void)
+{
 	g_wiimote_scanner.StopScanning();
 
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);