mirror of
https://github.com/ppy/osu
synced 2024-12-25 08:12:41 +00:00
Fix two different skins displaying at the same time when rapidly switching
This commit is contained in:
parent
a16ffd2976
commit
43aacb3831
@ -3,6 +3,7 @@
|
||||
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using osu.Framework.Bindables;
|
||||
using osu.Framework.Graphics;
|
||||
|
||||
@ -22,6 +23,8 @@ namespace osu.Game.Skinning
|
||||
|
||||
public bool ComponentsLoaded { get; private set; }
|
||||
|
||||
private CancellationTokenSource cancellationSource;
|
||||
|
||||
public SkinnableTargetContainer(SkinnableTarget target)
|
||||
{
|
||||
Target = target;
|
||||
@ -38,6 +41,9 @@ namespace osu.Game.Skinning
|
||||
|
||||
content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
|
||||
|
||||
cancellationSource?.Cancel();
|
||||
cancellationSource = null;
|
||||
|
||||
if (content != null)
|
||||
{
|
||||
LoadComponentAsync(content, wrapper =>
|
||||
@ -45,7 +51,7 @@ namespace osu.Game.Skinning
|
||||
AddInternal(wrapper);
|
||||
components.AddRange(wrapper.Children.OfType<ISkinnableDrawable>());
|
||||
ComponentsLoaded = true;
|
||||
});
|
||||
}, (cancellationSource = new CancellationTokenSource()).Token);
|
||||
}
|
||||
else
|
||||
ComponentsLoaded = true;
|
||||
|
Loading…
Reference in New Issue
Block a user