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