diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-06 14:52:09 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-07-25 13:04:22 +0200 |
| commit | 59eb7a864d7b98e7aac42e342ca49704cfab67f5 (patch) | |
| tree | a83a8386dc3201ca230603bd45a70e2ee3c8bff5 /Source/Core/DolphinWX/MainAndroid.cpp | |
| parent | 2c7ae7787d7c5f564b0acc52b7a8f23263c47b2e (diff) | |
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.
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 1389abdcee..604e75216a 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -622,6 +622,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv * updateMainFrameEvent.Wait(); } + Core::Shutdown(); UICommon::Shutdown(); ANativeWindow_release(surf); } |