Browse Source

qt: additional fixes for reentrant shutdown

nce_cpp
Liam 3 years ago
parent
commit
76c4ba3ee5
  1. 6
      src/yuzu/main.cpp

6
src/yuzu/main.cpp

@ -1839,9 +1839,11 @@ void GMainWindow::OnEmulationStopTimeExpired() {
void GMainWindow::OnEmulationStopped() { void GMainWindow::OnEmulationStopped() {
shutdown_timer.stop(); shutdown_timer.stop();
if (emu_thread) {
emu_thread->disconnect(); emu_thread->disconnect();
emu_thread->wait(); emu_thread->wait();
emu_thread = nullptr;
emu_thread.reset();
}
if (shutdown_dialog) { if (shutdown_dialog) {
shutdown_dialog->deleteLater(); shutdown_dialog->deleteLater();
@ -3029,6 +3031,8 @@ void GMainWindow::OnStopGame() {
if (OnShutdownBegin()) { if (OnShutdownBegin()) {
OnShutdownBeginDialog(); OnShutdownBeginDialog();
} else {
OnEmulationStopped();
} }
} }

Loading…
Cancel
Save