From 54852991f36f2136dd5240058e5db758f81e65ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Mon, 28 Sep 2020 12:24:30 +0200
Subject: [PATCH] Move SpinnerNoBlink to OsuSkinConfiguration

---
 osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs | 3 +--
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs  | 3 ++-
 osu.Game/Skinning/LegacySkinConfiguration.cs            | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index cce50b24ac..63cd48676e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -34,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
         {
-            spinnerBlink = !source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? true;
+            spinnerBlink = !source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value ?? true;
 
             drawableSpinner = (DrawableSpinner)drawableObject;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index e034e14eb0..63c9b53278 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         CursorRotate,
         HitCircleOverlayAboveNumber,
         HitCircleOverlayAboveNumer, // Some old skins will have this typo
-        SpinnerFrequencyModulate
+        SpinnerFrequencyModulate,
+        SpinnerNoBlink
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index a0e8fb2f92..828804b9cb 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Skinning
             ComboPrefix,
             ComboOverlap,
             AnimationFramerate,
-            LayeredHitSounds,
-            SpinnerNoBlink
+            LayeredHitSounds
         }
     }
 }