From 1218d41b50ee6d1e52552c533c110448b312e63d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 15 Nov 2019 11:52:49 +0300
Subject: [PATCH] Make Ruleset a property

---
 .../BeatmapSet/LeaderboardModSelector.cs      | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
index b400141abf..660d957e1a 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
@@ -21,7 +21,34 @@ namespace osu.Game.Overlays.BeatmapSet
     public class LeaderboardModSelector : CompositeDrawable
     {
         public readonly BindableList<Mod> SelectedMods = new BindableList<Mod>();
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+
+        private RulesetInfo ruleset;
+
+        public RulesetInfo Ruleset
+        {
+            get => ruleset;
+            set
+            {
+                if (ruleset == value)
+                {
+                    DeselectAll();
+                    return;
+                }
+
+                ruleset = value;
+
+                SelectedMods.Clear();
+                modsContainer.Clear();
+
+                if (ruleset == null)
+                    return;
+
+                modsContainer.Add(new ModButton(new NoMod()));
+                modsContainer.AddRange(ruleset.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
+
+                modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
+            }
+        }
 
         private readonly FillFlowContainer<ModButton> modsContainer;
 
@@ -38,26 +65,6 @@ namespace osu.Game.Overlays.BeatmapSet
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Ruleset.BindValueChanged(onRulesetChanged, true);
-        }
-
-        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
-        {
-            SelectedMods.Clear();
-            modsContainer.Clear();
-
-            if (ruleset.NewValue == null)
-                return;
-
-            modsContainer.Add(new ModButton(new NoMod()));
-            modsContainer.AddRange(ruleset.NewValue.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
-
-            modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
-        }
-
         private void selectionChanged(Mod mod, bool selected)
         {
             if (selected)