From 2a67246b218f323710572f3a1b53c56722171d55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Feb 2020 22:37:38 +0900
Subject: [PATCH] Ensure game is at main menu before performing exit on screen

---
 osu.Game/OsuGame.cs               | 2 +-
 osu.Game/Screens/Menu/MainMenu.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff3dee55af..79616ef97c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -446,7 +446,7 @@ namespace osu.Game
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
+        public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index cb5ceefb0f..c70fbb67a4 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -141,12 +141,15 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;
 
             exitConfirmed = true;
-            this.Exit();
+            game.PerformFromScreen(menu => menu.Exit());
         }
 
         private void preloadSongSelect()