From 9cdc1ba59219ecd31df04c235def14567f4fbee4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Oct 2021 13:43:45 +0900
Subject: [PATCH] Fix default legacy skin not being able to read from stored
 `skin.ini`

---
 osu.Game/Skinning/DefaultLegacySkin.cs |  9 +++++-
 osu.Game/Skinning/LegacySkin.cs        | 39 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 16ac17546d..cd6dbd9ddd 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -19,7 +19,14 @@ public DefaultLegacySkin(IStorageResourceProvider resources)
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(SkinInfo skin, IStorageResourceProvider resources)
-            : base(skin, new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy"), resources, string.Empty)
+            : base(
+                skin,
+                new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy"),
+                resources,
+                // A default legacy skin may still have a skin.ini if it is modified by the user.
+                // We must specify the stream directly as we are redirecting storage to the osu-resources location for other files.
+                new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files).GetStream("skin.ini")
+            )
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.CustomComboColours = new List<Color4>
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index b09620411b..5ab3ef84db 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -69,28 +69,37 @@ public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
         /// <param name="resources">Access to raw game resources.</param>
         /// <param name="configurationFilename">The user-facing filename of the configuration file to be parsed. Can accept an .osu or skin.ini file.</param>
         protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string configurationFilename)
+            : this(skin, storage, resources, storage?.GetStream(configurationFilename))
+        {
+        }
+
+        /// <summary>
+        /// Construct a new legacy skin instance.
+        /// </summary>
+        /// <param name="skin">The model for this skin.</param>
+        /// <param name="storage">A storage for looking up files within this skin using user-facing filenames.</param>
+        /// <param name="resources">Access to raw game resources.</param>
+        /// <param name="configurationStream">An optional stream containing the contents of a skin.ini file.</param>
+        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, [CanBeNull] Stream configurationStream)
             : base(skin, resources)
         {
-            using (var stream = storage?.GetStream(configurationFilename))
+            if (configurationStream != null)
             {
-                if (stream != null)
+                using (LineBufferedReader reader = new LineBufferedReader(configurationStream, true))
+                    Configuration = new LegacySkinDecoder().Decode(reader);
+
+                configurationStream.Seek(0, SeekOrigin.Begin);
+
+                using (LineBufferedReader reader = new LineBufferedReader(configurationStream))
                 {
-                    using (LineBufferedReader reader = new LineBufferedReader(stream, true))
-                        Configuration = new LegacySkinDecoder().Decode(reader);
+                    var maniaList = new LegacyManiaSkinDecoder().Decode(reader);
 
-                    stream.Seek(0, SeekOrigin.Begin);
-
-                    using (LineBufferedReader reader = new LineBufferedReader(stream))
-                    {
-                        var maniaList = new LegacyManiaSkinDecoder().Decode(reader);
-
-                        foreach (var config in maniaList)
-                            maniaConfigurations[config.Keys] = config;
-                    }
+                    foreach (var config in maniaList)
+                        maniaConfigurations[config.Keys] = config;
                 }
-                else
-                    Configuration = new LegacySkinConfiguration();
             }
+            else
+                Configuration = new LegacySkinConfiguration();
 
             if (storage != null)
             {