h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:47:52 +08:00
Code Issues Releases Wiki Activity

Fix operation cancelled exception when changing visual settings

Browse Source
This commit is contained in:
smoogipoo 2018-08-23 14:53:16 +09:00
parent de31187de6
commit c7db407832
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Skinning/LocalSkinOverrideContainer.cs
View File

@ -85,12 +85,10 @@ namespace osu.Game.Skinning
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins); beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
beatmapSkins.ValueChanged += val => onSourceChanged(); beatmapSkins.BindValueChanged(_ => onSourceChanged());
beatmapSkins.TriggerChange();
beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds); beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
beatmapHitsounds.ValueChanged += val => onSourceChanged(); beatmapHitsounds.BindValueChanged(_ => onSourceChanged(), true);
beatmapHitsounds.TriggerChange();
} }
protected override void LoadComplete() protected override void LoadComplete()

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

@ -52,5 +52,12 @@ namespace osu.Game.Skinning
protected virtual void SkinChanged(ISkinSource skin, bool allowFallback) protected virtual void SkinChanged(ISkinSource skin, bool allowFallback)
{ {
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
skin.SourceChanged -= onChange;
}
} }
} }