From 66b3945cd644abd7704adde5284211768981a36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 9 Jan 2024 10:44:30 +0100
Subject: [PATCH] Move current screen check to better place

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 3 ---
 osu.Game/Screens/Select/SongSelect.cs     | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 3cf8de5267..4951504ff5 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -92,9 +92,6 @@ namespace osu.Game.Screens.Select
         {
             if (playerLoader != null) return false;
 
-            if (!this.IsCurrentScreen())
-                return false;
-
             modsAtGameplayStart = Mods.Value;
 
             // Ctrl+Enter should start map with autoplay enabled.
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2d5c44e5a5..bf1724995a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -660,7 +660,8 @@ namespace osu.Game.Screens.Select
 
             logo.Action = () =>
             {
-                FinaliseSelection();
+                if (this.IsCurrentScreen())
+                    FinaliseSelection();
                 return false;
             };
         }