Merge pull request #17708 from frenzibyte/fix-texture-lookups-no-long…

…er-handling-paths Fix skin texture lookups not handling paths with extensions
ppy · Apr 7, 2022 · c40b1bf · c40b1bf
2 parents f069893 + fb9fe42
commit c40b1bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs
@@ -83,6 +83,20 @@ public sealed class LegacySkinTextureFallbackTest
                 "followpoint.png",
                 "[email protected]", 2
             },
+            new object[]
+            {
+                // Looking up a path with extension specified should work.
+                new[] { "Gameplay/osu/followpoint.png" },
+                "Gameplay/osu/followpoint.png",
+                "Gameplay/osu/followpoint.png", 1
+            },
+            new object[]
+            {
+                // Looking up a path with extension specified should also work with @2x sprites.
+                new[] { "Gameplay/osu/[email protected]" },
+                "Gameplay/osu/followpoint.png",
+                "Gameplay/osu/[email protected]", 2
+            },
         };
 
         [TestCaseSource(nameof(fallbackTestCases))]

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
@@ -443,9 +443,7 @@ protected override void ParseConfigurationStream(Stream stream)
                 string lookupName = name.Replace(@"@2x", string.Empty);
 
                 float ratio = 2;
-                string twoTimesFilename = Path.HasExtension(lookupName)
-                    ? @$"{Path.GetFileNameWithoutExtension(lookupName)}@2x{Path.GetExtension(lookupName)}"
-                    : @$"{lookupName}@2x";
+                string twoTimesFilename = $"{Path.ChangeExtension(lookupName, null)}@2x{Path.GetExtension(lookupName)}";
 
                 var texture = Textures?.Get(twoTimesFilename, wrapModeS, wrapModeT);