diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-30 13:47:50 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-03 20:09:50 +0200 |
| commit | cd817be92216c631f7e44e1e64e29fe8a2d4cec4 (patch) | |
| tree | 86c144d8b95d15f5610c8f2857c7767b04960cd3 | |
| parent | Merge pull request #1087 from yuriks/opengl-glad (diff) | |
| download | yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar.gz yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar.bz2 yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar.lz yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar.xz yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.tar.zst yuzu-cd817be92216c631f7e44e1e64e29fe8a2d4cec4.zip | |
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index d9bacfc3d..9aec16506 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(); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 7fb1b0dcb..11813a2a8 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -283,9 +283,6 @@ void GMainWindow::ShutdownGame() { emu_thread->wait(); emu_thread = nullptr; - // Shutdown the core emulation - System::Shutdown(); - // Update the GUI ui.action_Start->setEnabled(false); ui.action_Start->setText(tr("Start")); |