Merge pull request #29762 from peppy/fix-beatmap-difficulty-splitting

Fix beatmap difficulties not being split out on first load
ppy · Sep 7, 2024 · e88083a · e88083a
2 parents 7f687d5 + 4c6eb89
commit e88083a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -520,6 +520,18 @@ public void TestAddRemove()
             waitForSelection(set_count);
         }
 
+        [Solo]
+        [Test]
+        public void TestDifficultiesSplitOutOnLoad()
+        {
+            loadBeatmaps(new List<BeatmapSetInfo> { TestResources.CreateTestBeatmapSetInfo(diff_count) }, () => new FilterCriteria
+            {
+                Sort = SortMode.Difficulty,
+            });
+
+            checkVisibleItemCount(false, 3);
+        }
+
         [Test]
         public void TestAddRemoveDifficultySort()
         {

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -137,6 +137,8 @@ internal IEnumerable<BeatmapSetInfo> BeatmapSets
 
         private void loadNewRoot()
         {
+            beatmapsSplitOut = activeCriteria.SplitOutDifficulties;
+
             // Ensure no changes are made to the list while we are initialising items.
             // We'll catch up on changes via subscriptions anyway.
             BeatmapSetInfo[] loadableSets = detachedBeatmapSets!.ToArray();
@@ -726,7 +728,6 @@ void perform()
 
                 if (activeCriteria.SplitOutDifficulties != beatmapsSplitOut)
                 {
-                    beatmapsSplitOut = activeCriteria.SplitOutDifficulties;
                     loadNewRoot();
                     return;
                 }