From 06bd3d48151af534b9df05c9e784eca59f0914b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jun 2018 20:28:28 +0900
Subject: [PATCH] Use IBindable where possible

---
 osu.Game/Screens/Select/FilterControl.cs            | 9 ++++-----
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index abf14a653b..39f1a523ea 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -62,7 +62,7 @@ public GroupMode Group
             Sort = sort,
             SearchText = searchTextBox.Text,
             AllowConvertedBeatmaps = showConverted,
-            Ruleset = ruleset
+            Ruleset = ruleset.Value
         };
 
         public Action Exit;
@@ -163,14 +163,14 @@ public void Activate()
             searchTextBox.HoldFocus = true;
         }
 
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         private Bindable<bool> showConverted;
 
         public readonly Box Background;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, Bindable<RulesetInfo> parentRuleset, OsuConfigManager config)
+        private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
         {
             sortTabs.AccentColour = colours.GreenLight;
 
@@ -179,8 +179,7 @@ private void load(OsuColour colours, Bindable<RulesetInfo> parentRuleset, OsuCon
 
             if (parentRuleset != null)
                 ruleset.BindTo(parentRuleset);
-            ruleset.ValueChanged += val => updateCriteria();
-            ruleset.TriggerChange();
+            ruleset.BindValueChanged(val => updateCriteria(), true);
         }
 
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index f248cbd0f4..ac6154369d 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -32,7 +32,7 @@ public class Leaderboard : Container
 
         private FillFlowContainer<LeaderboardScore> scrollFlow;
 
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         public Action<Score> ScoreSelected;
 
@@ -192,7 +192,7 @@ public BeatmapInfo Beatmap
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(APIAccess api, Bindable<RulesetInfo> parentRuleset)
+        private void load(APIAccess api, IBindable<RulesetInfo> parentRuleset)
         {
             this.api = api;