From 59eb7a864d7b98e7aac42e342ca49704cfab67f5 Mon Sep 17 00:00:00 2001 From: Jules Blok 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/Main.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/DolphinWX/Main.cpp') diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index c89e0d8307..19a53332f4 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -364,6 +364,7 @@ void DolphinApp::OnEndSession(wxCloseEvent& event) int DolphinApp::OnExit() { + Core::Shutdown(); UICommon::Shutdown(); delete m_locale; -- cgit v1.2.3