From b6c4d5792ba33ec1025041ed97b57bbbe00bafc7 Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Sat, 6 Jun 2015 14:52:09 +0200
Subject: Revert "Join the emu thread in Core::Stop.  Get rid of Core::Shutdown
 which did that before."

This reverts commit ba664b3293e88ddee94a4b922ced192f3270b569.

Added documentation to Core::Shutdown() to prevent breaking changes.
---
 Source/Core/DolphinWX/MainAndroid.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Source/Core/DolphinWX/MainAndroid.cpp')

diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index 3788f42928..1d48f5c103 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -627,6 +627,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *
 			updateMainFrameEvent.Wait();
 	}
 
+	Core::Shutdown();
 	UICommon::Shutdown();
 	ANativeWindow_release(surf);
 
-- 
cgit v1.2.3