From 99e43c77c23709c90100cea34210c5a2d054a206 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Thu, 14 Jan 2021 16:53:55 -0500
Subject: [PATCH] Simplified colour config checks in SkinProvidingContainer.cs

---
 osu.Game/Skinning/SkinProvidingContainer.cs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2dc19667e4..d2645eff68 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
@@ -72,22 +73,12 @@ namespace osu.Game.Skinning
         {
             if (skin != null)
             {
-                switch (lookup)
-                {
-                    // todo: the GlobalSkinColours switch is pulled from LegacySkin and should not exist.
-                    // will likely change based on how databased storage of skin configuration goes.
-                    case GlobalSkinColours global:
-                        switch (global)
-                        {
-                            case GlobalSkinColours.ComboColours:
-                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
-                        }
+                TValue tValueTypeCheck = default;
 
-                        break;
-
-                    default:
-                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
-                }
+                if (lookup is GlobalSkinColours || tValueTypeCheck is Color4)
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
+                else
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);