diff options
| author |  bunnei | 2015-05-13 22:07:35 -0400 |
|---|---|---|
| committer | bunnei | 2015-05-13 22:07:35 -0400 |
| commit | 09c8110e1a5a4d72d93294f98f4dc725bdd4c648 (patch) | |
| tree | 640d7c34224bcc72c9174731632201cbea7a1d56 /src/citra_qt/main.cpp | |
| parent | Merge pull request #765 from lioncash/bkpt (diff) | |
| parent | Qt: Shutdown emulation session only if EmuThread exists. (diff) | |
| download | yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.gz yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.tar.xz yuzu-09c8110e1a5a4d72d93294f98f4dc725bdd4c648.zip | |
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) | |||
| 337 | settings.setValue("firstStart", false); | 337 | settings.setValue("firstStart", false); |
| 338 | SaveHotkeys(settings); | 338 | SaveHotkeys(settings); |
| 339 | 339 | ||
| 340 | ShutdownGame(); | 340 | // Shutdown session if the emu thread is active... |
| 341 | if (emu_thread != nullptr) | ||
| 342 | ShutdownGame(); | ||
| 341 | 343 | ||
| 342 | render_window->close(); | 344 | render_window->close(); |
| 343 | 345 | ||