From a62550b3239791678ab70613ad8ac522101e5788 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 20:14:18 +0900
Subject: [PATCH] Reapply filters on next change after a forced beatmap display

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

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 2ffb73f226..d78d407748 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,6 +25,13 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
+            if (Beatmap.Equals(criteria.SelectedBeatmap))
+            {
+                // bypass filtering for selected beatmap
+                Filtered.Value = false;
+                return;
+            }
+
             bool match =
                 criteria.Ruleset == null ||
                 Beatmap.RulesetID == criteria.Ruleset.ID ||
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 1108b72bd2..79c1a4cb6b 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select.Carousel
         /// <summary>
         /// This item is not in a hidden state.
         /// </summary>
-        public bool Visible => State.Value == CarouselItemState.Selected || (State.Value != CarouselItemState.Collapsed && !Filtered.Value);
+        public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered.Value;
 
         public virtual List<DrawableCarouselItem> Drawables
         {
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 9fa57af01d..a5c4e2961d 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
+        public BeatmapInfo SelectedBeatmap;
+
         public OptionalRange<double> StarDifficulty;
         public OptionalRange<float> ApproachRate;
         public OptionalRange<float> DrainRate;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 67626d1e4f..90ad7a7fdd 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -392,8 +392,11 @@ namespace osu.Game.Screens.Select
                 }
 
                 // Even if a ruleset mismatch was not the cause (ie. a text filter is applied),
-                // we still want to forcefully show the new beatmap, bypassing filters.
-                Carousel.SelectBeatmap(e.NewValue.BeatmapInfo);
+                // 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;
+                Carousel.Filter(criteria);
             }
         }