From 0e9242ee9a327e220d7716c812ffb4bb3468790d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 23 Aug 2020 10:28:05 +0300
Subject: [PATCH] Move combo font retrieval inside the legacy component

---
 .../Skinning/CatchLegacySkinTransformer.cs                 | 3 +--
 osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs     | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 0e434291c1..28cd0fb65b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -55,11 +55,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
                 case CatchSkinComponents.CatchComboCounter:
                     var comboFont = GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
-                    var fontOverlap = GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
                     // For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
                     if (this.HasFont(comboFont))
-                        return new LegacyComboCounter(Source, comboFont, fontOverlap);
+                        return new LegacyComboCounter(Source);
 
                     break;
             }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index 0d9df4f9a0..c1c70c3a0e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -13,6 +13,7 @@ using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -28,12 +29,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
         private readonly LegacyRollingCounter counter;
 
-        public LegacyComboCounter(ISkin skin, string fontName, float fontOverlap)
+        public LegacyComboCounter(ISkin skin)
         {
             this.skin = skin;
 
-            this.fontName = fontName;
-            this.fontOverlap = fontOverlap;
+            fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+            fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
 
             AutoSizeAxes = Axes.Both;