Merge branch 'master' into fix-hitsound-fallback

osu.Game.Tests/Visual/TestCaseToolbar.cs

@@ -16,8 +16,8 @@ public class TestCaseToolbar : OsuTestCase
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ToolbarButton),
-            typeof(ToolbarModeSelector),
-            typeof(ToolbarModeButton),
+            typeof(ToolbarRulesetSelector),
+            typeof(ToolbarRulesetButton),
             typeof(ToolbarNotificationButton),
         };
 

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -50,7 +50,7 @@ public Toolbar()
                         {
                             Action = () => OnHome?.Invoke()
                         },
-                        new ToolbarModeSelector()
+                        new ToolbarRulesetSelector()
                     }
                 },
                 new FillFlowContainer

osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarModeButton : ToolbarButton
+    public class ToolbarRulesetButton : ToolbarButton
     {
         private RulesetInfo ruleset;
         public RulesetInfo Ruleset

osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs

@@ -16,18 +16,18 @@
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarModeSelector : Container
+    public class ToolbarRulesetSelector : Container
     {
         private const float padding = 10;
 
         private readonly FillFlowContainer modeButtons;
         private readonly Drawable modeButtonLine;
-        private ToolbarModeButton activeButton;
+        private ToolbarRulesetButton activeButton;
 
         private RulesetStore rulesets;
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
-        public ToolbarModeSelector()
+        public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
 
@@ -73,7 +73,7 @@ private void load(RulesetStore rulesets, Bindable<RulesetInfo> parentRuleset)
             this.rulesets = rulesets;
             foreach (var r in rulesets.AvailableRulesets)
             {
-                modeButtons.Add(new ToolbarModeButton
+                modeButtons.Add(new ToolbarRulesetButton
                 {
                     Ruleset = r,
                     Action = delegate { ruleset.Value = r; }
@@ -115,7 +115,7 @@ protected override void Update()
 
         private void rulesetChanged(RulesetInfo ruleset)
         {
-            foreach (ToolbarModeButton m in modeButtons.Children.Cast<ToolbarModeButton>())
+            foreach (ToolbarRulesetButton m in modeButtons.Children.Cast<ToolbarRulesetButton>())
             {
                 bool isActive = m.Ruleset.ID == ruleset.ID;
                 m.Active = isActive;

osu.Game/Screens/Select/SongSelect.cs

@@ -193,8 +193,6 @@ private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dia
             dependencies.CacheAs(Ruleset);
             dependencies.CacheAs<IBindable<RulesetInfo>>(Ruleset);
 
-            base.Ruleset.ValueChanged += r => updateSelectedBeatmap(beatmapNoDebounce);
-
             if (Footer != null)
             {
                 Footer.AddButton(@"random", colours.Green, triggerRandom, Key.F2);
@@ -222,6 +220,12 @@ private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dia
             Beatmap.BindValueChanged(workingBeatmapChanged);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            base.Ruleset.ValueChanged += r => updateSelectedBeatmap(beatmapNoDebounce);
+        }
+
         public void Edit(BeatmapInfo beatmap)
         {
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value);