From a436372b05552b4d2e1c3cc6843ea9de67369dbe Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 9 Sep 2025 18:09:43 +0900
Subject: [PATCH] Allow exit during matchmaking intro (#137)

---
 .../Matchmaking/Screens/MatchmakingIntroScreen.cs  | 14 +++++---------
 .../Matchmaking/Screens/MatchmakingQueueScreen.cs  |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingIntroScreen.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingIntroScreen.cs
index 8a42712905..34c113c39f 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingIntroScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingIntroScreen.cs
@@ -37,11 +37,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
         [Resolved]
         private MusicController musicController { get; set; } = null!;
 
-        [Resolved]
-        private MatchmakingController controller { get; set; } = null!;
-
-        public override bool AllowUserExit => !ValidForResume;
-
         private Sample? dateWindupSample;
         private Sample? dateImpactSample;
         private Sample? beatmapWindupSample;
@@ -56,6 +51,11 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
 
         protected override BackgroundScreen CreateBackground() => new MatchmakingIntroBackgroundScreen(colourProvider);
 
+        public MatchmakingIntroScreen()
+        {
+            ValidForResume = false;
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
@@ -123,14 +123,10 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
 
             updateAnimationState();
             playDateWindupSample();
-
-            controller.SearchInForeground();
         }
 
         public override void OnSuspending(ScreenTransitionEvent e)
         {
-            ValidForResume = false;
-
             duckOperation?.Dispose();
 
             this.FadeOut(800, Easing.OutQuint);
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingQueueScreen.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingQueueScreen.cs
index f906a0e06f..8ec1505c1b 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingQueueScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Screens/MatchmakingQueueScreen.cs
@@ -169,6 +169,8 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
         {
             base.OnEntering(e);
 
+            controller.SearchInForeground();
+
             client.MatchmakingJoinLobby().FireAndForget();
 
             using (BeginDelayedSequence(800))