From e7e9197f03d2247fb2dfbb599401dff62a8160ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Jun 2021 00:42:50 +0900
Subject: [PATCH] Fix `FindProvider` not correctly checking legacy default in
 `SkinManager`

---
 osu.Game/Skinning/SkinManager.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 9aa2d90064..ea4e1232c3 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Skinning
 
         protected override string ImportFromStablePath => "Skins";
 
+        private readonly Skin defaultLegacySkin;
+
         public SkinManager(Storage storage, DatabaseContextFactory contextFactory, GameHost host, IResourceStore<byte[]> resources, AudioManager audio)
             : base(storage, contextFactory, new SkinStore(contextFactory, storage), host)
         {
@@ -55,6 +57,8 @@ namespace osu.Game.Skinning
             this.host = host;
             this.resources = resources;
 
+            defaultLegacySkin = new DefaultLegacySkin(this);
+
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
             CurrentSkin.ValueChanged += skin =>
             {
@@ -212,9 +216,16 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => lookupWithFallback(s => s.GetConfig<TLookup, TValue>(lookup));
 
-        public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(CurrentSkin.Value) ? CurrentSkin.Value : null;
+        public ISkin FindProvider(Func<ISkin, bool> lookupFunction)
+        {
+            if (lookupFunction(CurrentSkin.Value))
+                return CurrentSkin.Value;
 
-        private Skin defaultLegacySkin;
+            if (CurrentSkin.Value is LegacySkin && lookupFunction(defaultLegacySkin))
+                return defaultLegacySkin;
+
+            return null;
+        }
 
         private T lookupWithFallback<T>(Func<ISkin, T> func)
             where T : class
@@ -224,8 +235,6 @@ namespace osu.Game.Skinning
             if (selectedSkin != null)
                 return selectedSkin;
 
-            defaultLegacySkin ??= new DefaultLegacySkin(this);
-
             if (CurrentSkin.Value is LegacySkin)
                 return func(defaultLegacySkin);