diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
index e7311fbfbc..36e57c9067 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Screens.SelectV2
return true;
case BeatmapInfo:
- return Criteria.SplitOutDifficulties;
+ return !grouping.BeatmapSetsGroupedTogether;
case GroupDefinition:
return false;
diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
index d4e0a166ab..29c534cbe2 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Screens.SelectV2
{
public class BeatmapCarouselFilterGrouping : ICarouselFilter
{
+ public bool BeatmapSetsGroupedTogether { get; private set; }
+
///
/// Beatmap sets contain difficulties as related panels. This dictionary holds the relationships between set-difficulties to allow expanding them on selection.
///
@@ -36,8 +38,6 @@ namespace osu.Game.Screens.SelectV2
public async Task> Run(IEnumerable items, CancellationToken cancellationToken) => await Task.Run(() =>
{
- bool groupSetsTogether;
-
setItems.Clear();
groupItems.Clear();
@@ -48,12 +48,12 @@ namespace osu.Game.Screens.SelectV2
switch (criteria.Group)
{
default:
- groupSetsTogether = true;
+ BeatmapSetsGroupedTogether = true;
newItems.AddRange(items);
break;
case GroupMode.Artist:
- groupSetsTogether = true;
+ BeatmapSetsGroupedTogether = true;
char groupChar = (char)0;
foreach (var item in items)
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.SelectV2
break;
case GroupMode.Difficulty:
- groupSetsTogether = false;
+ BeatmapSetsGroupedTogether = false;
int starGroup = int.MinValue;
foreach (var item in items)
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.SelectV2
// Add set headers wherever required.
CarouselItem? lastItem = null;
- if (groupSetsTogether)
+ if (BeatmapSetsGroupedTogether)
{
for (int i = 0; i < newItems.Count; i++)
{