From 9cbb37b682fe35508c1aa030b4a97dad3ece41f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:59:59 +0900
Subject: [PATCH] Fix bindable being created far too late in construction

---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 7ebc26ebfb..28600ef55b 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
-        public Bindable<float> CursorScale;
+        public Bindable<float> CursorScale = new BindableFloat(1);
+
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
 
@@ -57,6 +58,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
 
             userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
@@ -65,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
-            CursorScale = new BindableFloat();
             CursorScale.ValueChanged += e =>
             {
                 var newScale = new Vector2(e.NewValue);
@@ -75,8 +77,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             };
 
             calculateScale();
-
-            base.LoadComplete();
         }
 
         /// <summary>