VERY experimental Nintendo Switch 2 emulator
C++
qt: additional fixes for reentrant shutdown
Liam76c4ba3ee5e6
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex c55f81c2f1..2ea3b7d59d 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -1839,9 +1839,11 @@ void GMainWindow::OnEmulationStopTimeExpired() {void GMainWindow::OnEmulationStopped() {shutdown_timer.stop();- emu_thread->disconnect();- emu_thread->wait();- emu_thread = nullptr;+ if (emu_thread) {+ emu_thread->disconnect();+ emu_thread->wait();+ emu_thread.reset();+ }if (shutdown_dialog) {shutdown_dialog->deleteLater();@@ -3029,6 +3031,8 @@ void GMainWindow::OnStopGame() {if (OnShutdownBegin()) {OnShutdownBeginDialog();+ } else {+ OnEmulationStopped();}}