early-access version 3251

README.md

@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3247.
+This is the source code for early-access 3251.
 
 ## Legal Notice
 

src/yuzu/main.cpp

@@ -1784,9 +1784,9 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
     OnStartGame();
 }
 
-void GMainWindow::OnShutdownBegin() {
+bool GMainWindow::OnShutdownBegin() {
     if (!emulation_running) {
-        return;
+        return false;
     }
 
     if (ui->action_Fullscreen->isChecked()) {
@@ -1798,6 +1798,10 @@ void GMainWindow::OnShutdownBegin() {
     // Disable unlimited frame rate
     Settings::values.use_speed_limit.SetValue(true);
 
+    if (system->IsShuttingDown()) {
+        return false;
+    }
+
     system->SetShuttingDown(true);
     discord_rpc->Pause();
 
@@ -1816,6 +1820,8 @@ void GMainWindow::OnShutdownBegin() {
     ui->action_Pause->setEnabled(false);
     ui->action_Restart->setEnabled(false);
     ui->action_Stop->setEnabled(false);
+
+    return true;
 }
 
 void GMainWindow::OnShutdownBeginDialog() {
@@ -3002,9 +3008,10 @@ void GMainWindow::OnStopGame() {
         return;
     }
 
-    OnShutdownBegin();
+    if (OnShutdownBegin()) {
         OnShutdownBeginDialog();
     }
+}
 
 void GMainWindow::OnLoadComplete() {
     loading_screen->OnLoadComplete();

src/yuzu/main.h

@@ -336,7 +336,7 @@ private slots:
     void OnReinitializeKeys(ReinitializeKeyBehavior behavior);
     void OnLanguageChanged(const QString& locale);
     void OnMouseActivity();
-    void OnShutdownBegin();
+    bool OnShutdownBegin();
     void OnShutdownBeginDialog();
     void OnEmulationStopped();
     void OnEmulationStopTimeExpired();