From 2c975fb60b7e2f4a46d1d726e458dbd5b3c829fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n?= <atablante04@gmail.com>
Date: Fri, 9 Aug 2024 08:26:02 -0400
Subject: [PATCH] Fixes confirmation issues in SAVE_AND_QUIT and LOG_OUT

---
 src/ui/menu-ui-handler.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 24e76035972..9d56549fa0a 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -352,6 +352,7 @@ export default class MenuUiHandler extends MessageUiHandler {
           }
         }
       }
+      this.showText("", 0);
       switch (adjustedCursor) {
       case MenuOptions.GAME_SETTINGS:
         ui.setOverlayMode(Mode.SETTINGS);
@@ -442,9 +443,13 @@ export default class MenuUiHandler extends MessageUiHandler {
           success = true;
           if (this.scene.currentBattle.turn > 1) {
             ui.showText(i18next.t("menuUiHandler:losingProgressionWarning"), null, () => {
+              if (!this.active) {
+                this.showText("", 0);
+                return;
+              }
               ui.setOverlayMode(Mode.CONFIRM, () => this.scene.gameData.saveAll(this.scene, true, true, true, true).then(() => this.scene.reset(true)), () => {
                 ui.revertMode();
-                ui.showText("", 0);
+                this.showText("", 0);
               }, false, -98);
             });
           } else {
@@ -467,9 +472,13 @@ export default class MenuUiHandler extends MessageUiHandler {
         };
         if (this.scene.currentBattle) {
           ui.showText(i18next.t("menuUiHandler:losingProgressionWarning"), null, () => {
+            if (!this.active) {
+              this.showText("", 0);
+              return;
+            }
             ui.setOverlayMode(Mode.CONFIRM, doLogout, () => {
               ui.revertMode();
-              ui.showText("", 0);
+              this.showText("", 0);
             }, false, -98);
           });
         } else {