Merge pull request #616 from Armada651/shutdown

Shutdown the Core before other components.
dolphin-emu · Jul 13, 2014 · 4d02675 · 4d02675
2 parents 0c95fcf + aa24952
commit 4d02675
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
@@ -453,11 +453,11 @@ void DolphinApp::OnEndSession(wxCloseEvent& event)
 
 int DolphinApp::OnExit()
 {
+	Core::Shutdown();
 	WiimoteReal::Shutdown();
 	VideoBackend::ClearList();
 	SConfig::Shutdown();
 	LogManager::Shutdown();
-	Core::Shutdown();
 
 	delete m_locale;
 

diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -385,11 +385,11 @@ int main(int argc, char* argv[])
 #endif
 	}
 
+	Core::Shutdown();
 	WiimoteReal::Shutdown();
 	VideoBackend::ClearList();
 	SConfig::Shutdown();
 	LogManager::Shutdown();
-	Core::Shutdown();
 
 	return 0;
 }