From f8776a0be4924acfc5673b9683d4ef8fab702390 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 22:59:49 +0900
Subject: [PATCH] Display all difficulties from overriding selection

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 2 +-
 osu.Game/Screens/Select/FilterCriteria.cs           | 2 +-
 osu.Game/Screens/Select/SongSelect.cs               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index d78d407748..c110608a0e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
-            if (Beatmap.Equals(criteria.SelectedBeatmap))
+            if (Beatmap.BeatmapSet.Equals(criteria.SelectedBeatmapSet))
             {
                 // bypass filtering for selected beatmap
                 Filtered.Value = false;
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index a5c4e2961d..18be4fcac8 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
-        public BeatmapInfo SelectedBeatmap;
+        public BeatmapSetInfo SelectedBeatmapSet;
 
         public OptionalRange<double> StarDifficulty;
         public OptionalRange<float> ApproachRate;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 90ad7a7fdd..6577ed8506 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -395,7 +395,7 @@ namespace osu.Game.Screens.Select
                 // we still want to temporarily show the new beatmap, bypassing filters.
                 // This will be undone the next time the user changes the filter.
                 var criteria = FilterControl.CreateCriteria();
-                criteria.SelectedBeatmap = e.NewValue.BeatmapInfo;
+                criteria.SelectedBeatmapSet = e.NewValue.BeatmapInfo.BeatmapSet;
                 Carousel.Filter(criteria);
             }
         }