diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-10 21:02:47 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-10 21:02:47 +0200 |
| commit | bc655d1a8246cb3be69900446a050ffbafcee14f (patch) | |
| tree | 2a1a9f189b0fac4bac33d7c9d84e148717712904 /Source/Core/DolphinWX/Main.cpp | |
| parent | 15c1250d9d3f7aa7821a142582d63f38f782f15a (diff) | |
| parent | 4df00ae5441aefe8a13548152036f91dd3e4dda0 (diff) | |
Merge pull request #515 from Armada651/threading
Make the emulation stop asynchronous to prevent deadlocks.
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 3643d6e5ec..0559e9b7bf 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -37,6 +37,7 @@ #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/CoreParameter.h" #include "Core/Movie.h" #include "Core/HW/Wiimote.h" @@ -455,6 +456,7 @@ int DolphinApp::OnExit() VideoBackend::ClearList(); SConfig::Shutdown(); LogManager::Shutdown(); + Core::Shutdown(); delete m_locale; |