From 0915a94470bd67b3d1cdcabb21bd12c6d3e66373 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Sep 2019 16:53:27 +0900
Subject: [PATCH] Make BeatDivisor use OptionalRange

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

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 60e556a261..7017310018 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select.Carousel
             match &= criteria.Length.IsInRange(Beatmap.Length);
             match &= criteria.BPM.IsInRange(Beatmap.BPM);
 
-            match &= !criteria.BeatDivisor.HasValue || criteria.BeatDivisor == Beatmap.BeatDivisor;
+            match &= criteria.BeatDivisor.IsInRange(Beatmap.BeatDivisor);
             match &= !criteria.OnlineStatus.HasValue || criteria.OnlineStatus == Beatmap.Status;
 
             if (match)
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 8fda6c6a97..829f16d622 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -226,8 +226,8 @@ namespace osu.Game.Screens.Select
                         updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
                         break;
 
-                    case "divisor" when op == ":" && int.TryParse(value, out var divisor):
-                        criteria.BeatDivisor = divisor;
+                    case "divisor" when int.TryParse(value, out var divisor):
+                        updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
                         break;
 
                     case "status" when op == ":" && Enum.TryParse<BeatmapSetOnlineStatus>(value, ignoreCase: true, out var statusValue):
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 4867f27c0b..4584c63c2e 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Screens.Select
         public OptionalRange<float> CircleSize;
         public OptionalRange<double> Length;
         public OptionalRange<double> BPM;
-
-        public int? BeatDivisor;
+        public OptionalRange<int> BeatDivisor;
 
         public BeatmapSetOnlineStatus? OnlineStatus;