diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-30 08:47:50 -0300 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-03 15:09:50 -0300 |
commit | cd817be92216c631f7e44e1e64e29fe8a2d4cec4 (patch) | |
tree | 86c144d8b95d15f5610c8f2857c7767b04960cd3 /src/citra_qt/bootmanager.cpp | |
parent | cc19a766563f718fd62548dbb9166919cff1a8c3 (diff) |
citra-qt: Move system shutdown to run inside EmuThread
This stops (for some reason sporadic) crashes and OpenGL errors during
shutdown, when the OpenGL renderer tries to clean up objects from the
UI thread, which has no OpenGL context active.
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index d9bacfc3d7..9aec165069 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -72,6 +72,9 @@ void EmuThread::run() { } } + // Shutdown the core emulation + System::Shutdown(); + MicroProfileOnThreadExit(); render_window->moveContext(); |