From 224c0420e673fe01a0bcd5485726f0857bc194e8 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Wed, 25 Oct 2023 05:30:51 +0200
Subject: [PATCH] early-access version 3947

---
 README.md         |  2 +-
 src/yuzu/main.cpp | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2ade34585..027e7e3a8 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3946.
+This is the source code for early-access 3947.
 
 ## Legal Notice
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2b30b0096..3eaa84a04 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3440,31 +3440,35 @@ void GMainWindow::OnStopGame() {
         play_time_manager->Stop();
         // Update game list to show new play time
         game_list->PopulateAsync(UISettings::values.game_dirs);
-        OnEmulationStopped();
+        if (OnShutdownBegin()) {
+            OnShutdownBeginDialog();
+        } else {
+            OnEmulationStopped();
+        }
     }
 }
 
 bool GMainWindow::ConfirmShutdownGame() {
-    bool showDialog = false;
     if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) {
         if (system->GetExitLocked()) {
-            showDialog = ConfirmForceLockedExit();
+            if (!ConfirmForceLockedExit()) {
+                return false;
+            }
         } else {
-            showDialog = ConfirmChangeGame();
+            if (!ConfirmChangeGame()) {
+                return false;
+            }
         }
     } else {
         if (UISettings::values.confirm_before_stopping.GetValue() ==
                 ConfirmStop::Ask_Based_On_Game &&
             system->GetExitLocked()) {
-            showDialog = ConfirmForceLockedExit();
+            if (!ConfirmForceLockedExit()) {
+                return false;
+            }
         }
     }
-
-    if (showDialog && OnShutdownBegin()) {
-        OnShutdownBeginDialog();
-    }
-
-    return showDialog;
+    return true;
 }
 
 void GMainWindow::OnLoadComplete() {