From 8506029237cc57cb8f5b9f457daf5185eb271325 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Apr 2020 13:46:37 +0900
Subject: [PATCH] Fix SkinnableTestScene losing test resources on dynamic
 recompilation

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index d0113b3096..71d3266d18 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Tests.Visual
         private Skin specialSkin;
         private Skin oldSkin;
 
+        // Keep a static reference to ensure we don't use a dynamically recompiled DLL as a source (resources will be missing).
+        private static DllResourceStore dllStore;
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -34,7 +37,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
-            var dllStore = new DllResourceStore(GetType().Assembly);
+            dllStore ??= new DllResourceStore(GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
             defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);