From 7cff413ab016a4f2dcdffbfcb060f3d5e2fd1718 Mon Sep 17 00:00:00 2001
From: EVAST9919 <megaman9919@gmail.com>
Date: Wed, 11 Oct 2017 20:25:12 +0300
Subject: [PATCH] Fix wrong beatmap selection in song-select menu on deleting
 selected beatmap

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c72f599955..245dfb091c 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -375,6 +375,9 @@ namespace osu.Game.Screens.Select
             if (group == null)
                 return;
 
+            if (selectedGroup == group)
+                SelectNext();
+
             groups.Remove(group);
             panels.Remove(group.Header);
             foreach (var p in group.BeatmapPanels)
@@ -383,9 +386,6 @@ namespace osu.Game.Screens.Select
             scrollableContent.Remove(group.Header);
             scrollableContent.RemoveRange(group.BeatmapPanels);
 
-            if (selectedGroup == group)
-                SelectNext();
-
             computeYPositions();
         }