From aa2495205ede4259e2f808cf37a18ac56ed07b52 Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Sun, 13 Jul 2014 23:47:59 +0200
Subject: [PATCH] Shutdown the Core before other components.

Other components depend on the EmuThread being stopped.
---
 Source/Core/DolphinWX/Main.cpp      | 2 +-
 Source/Core/DolphinWX/MainNoGUI.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 5ebb055ccc..ba63864728 100644
--- 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
index 6af755329c..7605d22075 100644
--- 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;
 }