RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations

This commit is contained in:
Dean Herbert 2019-07-25 16:09:15 +09:00
parent 3ca41b9c0a 58feba72a3
commit 900d17a4db
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Skinning/SkinReloadableDrawable.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
@ -36,12 +36,15 @@ private void load(ISkinSource source)
skin.SourceChanged += onChange;
}
private void onChange() => SkinChanged(skin, allowDefaultFallback);
private void onChange() =>
// schedule required to avoid calls after disposed.
// note that this has the side-effect of components only performance a skin change when they are alive.
Scheduler.AddOnce(() => SkinChanged(skin, allowDefaultFallback));
protected override void LoadAsyncComplete()
{
base.LoadAsyncComplete();
onChange();
SkinChanged(skin, allowDefaultFallback);
}
/// <summary>