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-22 09:15:19 +0200 |
| commit | b6c4d5792ba33ec1025041ed97b57bbbe00bafc7 (patch) | |
| tree | 3cc40ed7b07a587d02fd114a557656241c1b8333 /Source/Core/DolphinWX/MainNoGUI.cpp | |
| parent | 40162fdfc1306ece8a9757e38042f0383efdf70e (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/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainNoGUI.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 1f559b9f88..5d50423f0a 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -358,6 +358,7 @@ int main(int argc, char* argv[]) while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) updateMainFrameEvent.Wait(); + Core::Shutdown(); platform->Shutdown(); UICommon::Shutdown(); |