Merge pull request #33331 from peppy/song-select-v2-fix-incorrect-gameplay-start

SongSelectV2: Fix carousel activating selection when only one valid item in list

osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselTestScene.cs

@@ -191,6 +191,12 @@ namespace osu.Game.Tests.Visual.SongSelectV2
         protected void CheckNoSelection() => AddAssert("has no selection", () => Carousel.CurrentSelection, () => Is.Null);
         protected void CheckHasSelection() => AddAssert("has selection", () => Carousel.CurrentSelection, () => Is.Not.Null);
 
+        protected void CheckRequestPresentCount(int expected) =>
+            AddAssert($"check present count is {expected}", () => Carousel.RequestPresentBeatmapCount, () => Is.EqualTo(expected));
+
+        protected void CheckActivationCount(int expected) =>
+            AddAssert($"check activation count is {expected}", () => Carousel.ActivationCount, () => Is.EqualTo(expected));
+
         protected void CheckDisplayedBeatmapsCount(int expected)
         {
             AddAssert($"{expected} diffs displayed", () => Carousel.MatchedBeatmapsCount, () => Is.EqualTo(expected));
@@ -375,6 +381,9 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
         public partial class TestBeatmapCarousel : BeatmapCarousel
         {
+            public int ActivationCount { get; private set; }
+            public int RequestPresentBeatmapCount { get; private set; }
+
             public int FilterDelay = 0;
 
             public IEnumerable<BeatmapInfo> PostFilterBeatmaps = null!;
@@ -385,6 +394,17 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             public new BeatmapSetInfo? ExpandedBeatmapSet => base.ExpandedBeatmapSet;
             public new GroupDefinition? ExpandedGroup => base.ExpandedGroup;
 
+            public TestBeatmapCarousel()
+            {
+                RequestPresentBeatmap = _ => RequestPresentBeatmapCount++;
+            }
+
+            protected override void HandleItemActivated(CarouselItem item)
+            {
+                ActivationCount++;
+                base.HandleItemActivated(item);
+            }
+
             protected override async Task<IEnumerable<CarouselItem>> FilterAsync(bool clearExistingPanels = false)
             {
                 var items = await base.FilterAsync(clearExistingPanels);

osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselNoGrouping.cs

@@ -190,6 +190,58 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             WaitForSelection(4, 0);
         }
 
+        [Test]
+        public void TestSingleItemTraversal()
+        {
+            CheckNoSelection();
+            AddBeatmaps(1, 3);
+
+            WaitForSelection(0, 0);
+            CheckActivationCount(0);
+
+            SelectNextGroup();
+            WaitForSelection(0, 0);
+
+            // In the case of a grouped beatmap set, the header gets activated and re-selects the recommended difficulty.
+            // This is probably fine.
+            CheckActivationCount(1);
+            // We don't want it to request present though, which would start gameplay.
+            CheckRequestPresentCount(0);
+
+            SelectPrevGroup();
+            WaitForSelection(0, 0);
+
+            CheckActivationCount(1);
+            CheckRequestPresentCount(0);
+        }
+
+        [Test]
+        public void TestSingleItemTraversal_DifficultySplit()
+        {
+            SortBy(SortMode.Difficulty);
+
+            CheckNoSelection();
+            AddBeatmaps(1, 1);
+
+            WaitForSelection(0, 0);
+            CheckActivationCount(0);
+
+            SelectNextGroup();
+            WaitForSelection(0, 0);
+
+            // In the case of a grouped beatmap set, the header gets activated and re-selects the recommended difficulty.
+            // This is probably fine.
+            CheckActivationCount(0);
+            // We don't want it to request present though, which would start gameplay.
+            CheckRequestPresentCount(0);
+
+            SelectPrevGroup();
+            WaitForSelection(0, 0);
+
+            CheckActivationCount(0);
+            CheckRequestPresentCount(0);
+        }
+
         [Test]
         public void TestEmptyTraversal()
         {

osu.Game/Graphics/Carousel/Carousel.cs

@@ -530,6 +530,10 @@ namespace osu.Game.Graphics.Carousel
             do
             {
                 newIndex = (newIndex + direction + carouselItems.Count) % carouselItems.Count;
+
+                if (newIndex == originalIndex)
+                    break;
+
                 var newItem = carouselItems[newIndex];
 
                 if (CheckValidForGroupSelection(newItem))
@@ -537,7 +541,7 @@ namespace osu.Game.Graphics.Carousel
                     HandleItemActivated(newItem);
                     return;
                 }
-            } while (newIndex != originalIndex);
+            } while (true);
         }
 
         #endregion