Merge pull request #763 from bunnei/qt-fix-crash

Qt: Shutdown emulation session only if EmuThread exists.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f115c5b6..7b028e32 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();