From 767a2a10bd0f0798eb5b313068c5b43b3f962160 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 13:56:38 +0900
Subject: [PATCH 1/2] Fix incorrect sliderendcircle fallback logic

Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
---
 .../Skinning/LegacyMainCirclePiece.cs         | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index f051cbfa3b..d556ecb9bc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -49,6 +49,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 
+            Texture baseTexture;
+            Texture overlayTexture;
+            bool allowFallback = false;
+
+            // attempt lookup using priority specification
+            baseTexture = getTextureWithFallback(string.Empty);
+
+            // if the base texture was not found without a fallback, switch on fallback mode and re-perform the lookup.
+            if (baseTexture == null)
+            {
+                allowFallback = true;
+                baseTexture = getTextureWithFallback(string.Empty);
+            }
+
+            // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
+            // the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
+            // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png (potentially from the default/fall-through skin).
+            overlayTexture = getTextureWithFallback("overlay");
+
             InternalChildren = new Drawable[]
             {
                 circleSprites = new Container<Sprite>
@@ -60,13 +79,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     {
                         hitCircleSprite = new Sprite
                         {
-                            Texture = getTextureWithFallback(string.Empty),
+                            Texture = baseTexture,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
                         hitCircleOverlay = new Sprite
                         {
-                            Texture = getTextureWithFallback("overlay"),
+                            Texture = overlayTexture,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         }
@@ -101,8 +120,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 Texture tex = null;
 
                 if (!string.IsNullOrEmpty(priorityLookup))
+                {
                     tex = skin.GetTexture($"{priorityLookup}{name}");
 
+                    if (!allowFallback)
+                        return tex;
+                }
+
                 return tex ?? skin.GetTexture($"hitcircle{name}");
             }
         }

From 048507478ee199fc155be842a5d008a05dcf1869 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 14:12:46 +0900
Subject: [PATCH 2/2] Join declaration and specification

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index d556ecb9bc..382d6e53cc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -49,12 +49,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
 
-            Texture baseTexture;
-            Texture overlayTexture;
             bool allowFallback = false;
 
             // attempt lookup using priority specification
-            baseTexture = getTextureWithFallback(string.Empty);
+            Texture baseTexture = getTextureWithFallback(string.Empty);
 
             // if the base texture was not found without a fallback, switch on fallback mode and re-perform the lookup.
             if (baseTexture == null)
@@ -66,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
             // the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png (potentially from the default/fall-through skin).
-            overlayTexture = getTextureWithFallback("overlay");
+            Texture overlayTexture = getTextureWithFallback("overlay");
 
             InternalChildren = new Drawable[]
             {