From 33f8c8419ab279e1b4331ad76a5d299ff462d130 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 Dec 2017 21:25:54 +0900
Subject: [PATCH] Fix initial beatmap selection potentially being incorrect

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 6e43f6fb01..2dba274831 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -160,13 +160,8 @@ namespace osu.Game.Screens.Select
 
         public void SelectBeatmap(BeatmapInfo beatmap)
         {
-            if (beatmap == null || beatmap.Hidden)
-            {
-                SelectNext();
+            if (beatmap?.Hidden != false)
                 return;
-            }
-
-            if (beatmap == SelectedBeatmap) return;
 
             foreach (CarouselBeatmapSet group in beatmapSets)
             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d9a3f2faea..1fea4d0ccb 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -197,8 +197,8 @@ namespace osu.Game.Screens.Select
 
             Beatmap.ValueChanged += b =>
             {
-                if (!IsCurrentScreen) return;
-                carousel.SelectBeatmap(b?.BeatmapInfo);
+                if (IsCurrentScreen)
+                    carousel.SelectBeatmap(b?.BeatmapInfo);
             };
         }