From 43aacb383170dcd854561c890fa8c7d6c6f5e1f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Oct 2021 16:11:15 +0900
Subject: [PATCH] Fix two different skins displaying at the same time when
 rapidly switching

---
 osu.Game/Skinning/SkinnableTargetContainer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index e7125bb034..20c2fcc075 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 
@@ -22,6 +23,8 @@ public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
 
         public bool ComponentsLoaded { get; private set; }
 
+        private CancellationTokenSource cancellationSource;
+
         public SkinnableTargetContainer(SkinnableTarget target)
         {
             Target = target;
@@ -38,6 +41,9 @@ public void Reload()
 
             content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
 
+            cancellationSource?.Cancel();
+            cancellationSource = null;
+
             if (content != null)
             {
                 LoadComponentAsync(content, wrapper =>
@@ -45,7 +51,7 @@ public void Reload()
                     AddInternal(wrapper);
                     components.AddRange(wrapper.Children.OfType<ISkinnableDrawable>());
                     ComponentsLoaded = true;
-                });
+                }, (cancellationSource = new CancellationTokenSource()).Token);
             }
             else
                 ComponentsLoaded = true;