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

Qt: Shutdown emulation session only if EmuThread exists.
master
bunnei 2015-05-13 22:07:35 +07:00
commit 09c8110e1a
1 changed files with 3 additions and 1 deletions

@ -337,6 +337,8 @@ void GMainWindow::closeEvent(QCloseEvent* event)
settings.setValue("firstStart", false); settings.setValue("firstStart", false);
SaveHotkeys(settings); SaveHotkeys(settings);
// Shutdown session if the emu thread is active...
if (emu_thread != nullptr)
ShutdownGame(); ShutdownGame();
render_window->close(); render_window->close();