diff options
| author | bunnei <bunneidev@gmail.com> | 2015-05-13 22:07:35 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-05-13 22:07:35 -0400 |
| commit | 09c8110e1a5a4d72d93294f98f4dc725bdd4c648 (patch) | |
| tree | 640d7c34224bcc72c9174731632201cbea7a1d56 /src/citra_qt/main.cpp | |
| parent | 9e8b703b5e83d34c452b7c34af5be09755b3843f (diff) | |
| parent | c3bd7979175de01b7392cb8de48fd1caa6ce89cb (diff) | |
Merge pull request #763 from bunnei/qt-fix-crash
Qt: Shutdown emulation session only if EmuThread exists.
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 4 |
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(); |