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/MainNoGUI.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/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainNoGUI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index d4b75d83cb..0345e20b2b 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -131,7 +131,7 @@ void Host_SetWiiMoteConnectionState(int _State) {} void X11_MainLoop() { bool fullscreen = SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen; - while (Core::GetState() == Core::CORE_UNINITIALIZED) + while (!Core::IsRunning()) updateMainFrameEvent.Wait(); Display *dpy = XOpenDisplay(0); |