From 4ef991b97309868a507a63097caa9de1611da9be Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 27 Aug 2019 19:42:17 +0300
Subject: [PATCH] Loop over lookup names on default-samples retrieval

---
 osu.Game/Skinning/SkinnableSound.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 23093d9bd9..0c20241c4c 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -45,10 +45,9 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
                 var ch = skin.GetSample(s);
 
                 if (ch == null && allowFallback)
-                    if (s is HitSampleInfo hsi)
-                        ch = audio.Samples.Get(string.IsNullOrEmpty(hsi.Namespace)
-                            ? $"Gameplay/{hsi.Namespace}/{hsi.Bank}-{hsi.Name}"
-                            : $"Gameplay/{hsi.Bank}-{hsi.Name}");
+                    foreach (var lookup in s.LookupNames)
+                        if ((ch = audio.Samples.Get($"Gameplay/{lookup}")) != null)
+                            break;
 
                 if (ch != null)
                     ch.Volume.Value = s.Volume / 100.0;