From f3bcb0628c828b12484c4b6f46be8b44c3599ccd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 4 Apr 2020 19:09:52 +0300
Subject: [PATCH] Add helper methods for retrieving other skin hyper-dash
 colours

---
 osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs | 7 +++++++
 osu.Game.Rulesets.Catch/UI/Catcher.cs                   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
index 8fc0831918..48e11121ea 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchSkinExtensions.cs
@@ -9,6 +9,13 @@ namespace osu.Game.Rulesets.Catch.Skinning
 {
     internal static class CatchSkinExtensions
     {
+        public static IBindable<Color4> GetHyperDashCatcherColour(this ISkin skin)
+            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+
+        public static IBindable<Color4> GetHyperDashEndGlowColour(this ISkin skin)
+            => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage) ??
+               skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
+
         public static IBindable<Color4> GetHyperDashFruitColour(this ISkin skin)
             => skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit) ??
                skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash);
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 98cc10aa31..49c9a77277 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -389,9 +389,9 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             base.SkinChanged(skin, allowFallback);
 
-            hyperDashColour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ?? DefaultHyperDashColour;
-            hyperDashEndGlowColour = skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ?? hyperDashColour;
             updateCatcherColour();
+            hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour;
+            hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour;
         }
 
         protected override void Update()