From 01da3924ccf7ccf91431ffb22db3fd15cf468b50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Apr 2022 11:32:35 +0900
Subject: [PATCH] Simplify `IsCurrentScreen` check to only apply to relevant
 call

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs         | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 2e8f625eba..289b8730ce 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -74,18 +74,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
                 task.FireAndForget(onSuccess: () => Schedule(() =>
                 {
+                    loadingLayer.Hide();
+
                     // If an error or server side trigger occurred this screen may have already exited by external means.
                     if (!this.IsCurrentScreen())
-                        return;
-
-                    loadingLayer.Hide();
-                    this.Exit();
+                        this.Exit();
                 }), onError: _ => Schedule(() =>
                 {
-                    // If an error or server side trigger occurred this screen may have already exited by external means.
-                    if (!this.IsCurrentScreen())
-                        return;
-
                     loadingLayer.Hide();
                     Carousel.AllowSelection = true;
                 }));