summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-14 04:07:35 +0200
committerbunnei <bunneidev@gmail.com>2015-05-14 04:07:35 +0200
commit09c8110e1a5a4d72d93294f98f4dc725bdd4c648 (patch)
tree640d7c34224bcc72c9174731632201cbea7a1d56
parentMerge pull request #765 from lioncash/bkpt (diff)
parentQt: Shutdown emulation session only if EmuThread exists. (diff)
downloadyuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.gz
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.bz2
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.lz
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.xz
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.zst
yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.zip
-rw-r--r--src/citra_qt/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f115c5b6a..7b028e323 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -337,7 +337,9 @@ void GMainWindow::closeEvent(QCloseEvent* event)
settings.setValue("firstStart", false);
SaveHotkeys(settings);
- ShutdownGame();
+ // Shutdown session if the emu thread is active...
+ if (emu_thread != nullptr)
+ ShutdownGame();
render_window->close();