From 148089f160240fc408f5a68b72caa2b84dc8731e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 2 Oct 2019 16:08:19 -0700
Subject: [PATCH] Revert "Remove unnecessary exitConfirmed condition check"

This reverts commit 38fe519c91f9836f46b6a9347e4ceb97a96f0d67.
---
 osu.Game/Screens/Menu/MainMenu.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 6deb29c2f2..df4803b2b6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -80,9 +80,9 @@ namespace osu.Game.Screens.Menu
                     Action = () =>
                     {
                         if (holdDelay.Value > 0)
-                            this.Exit();
-                        else if (dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
-                            dialogOverlay.Push(new ConfirmExitDialog(this.Exit, () => exitConfirmOverlay.Abort()));
+                            confirmAndExit();
+                        else if (!exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
+                            dialogOverlay.Push(new ConfirmExitDialog(confirmAndExit, () => exitConfirmOverlay.Abort()));
                     }
                 });
             }
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Menu
                             OnEdit = delegate { this.Push(new Editor()); },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
-                            OnExit = this.Exit,
+                            OnExit = confirmAndExit,
                         }
                     }
                 },
@@ -129,6 +129,12 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
+        private void confirmAndExit()
+        {
+            exitConfirmed = true;
+            this.Exit();
+        }
+
         private void preloadSongSelect()
         {
             if (songSelect == null)
@@ -166,6 +172,8 @@ namespace osu.Game.Screens.Menu
             Beatmap.ValueChanged += beatmap_ValueChanged;
         }
 
+        private bool exitConfirmed;
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);