From 21c6ac8c43725f8739dcaea3a2b6105e7feab142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Apr 2020 12:12:28 +0900
Subject: [PATCH] Allow closing the game during intro

---
 osu.Game/OsuGame.cs                  | 5 +----
 osu.Game/Screens/Menu/IntroScreen.cs | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f5f7d0cef4..8e62819c95 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -914,10 +914,7 @@ namespace osu.Game
             if (ScreenStack.CurrentScreen is Loader)
                 return false;
 
-            if (introScreen == null)
-                return true;
-
-            if (!introScreen.DidLoadMenu || !(ScreenStack.CurrentScreen is IntroScreen))
+            if (introScreen.DidLoadMenu && !(ScreenStack.CurrentScreen is IntroScreen))
             {
                 Scheduler.Add(introScreen.MakeCurrent);
                 return true;
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index d2296573a6..736202ee52 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -96,8 +96,6 @@ namespace osu.Game.Screens.Menu
             Track = introBeatmap.Track;
         }
 
-        public override bool OnExiting(IScreen next) => !DidLoadMenu;
-
         public override void OnResuming(IScreen last)
         {
             this.FadeIn(300);