From c3bd7979175de01b7392cb8de48fd1caa6ce89cb Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 12 May 2015 23:14:24 -0400 Subject: Qt: Shutdown emulation session only if EmuThread exists. --- src/citra_qt/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/citra_qt/main.cpp') 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(); -- cgit v1.2.3