RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 10:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid hard crash if Save() is called before preparing for mutation

Browse Source
This commit is contained in:
Dean Herbert 2021-05-12 17:42:04 +09:00
parent 9df08560b6
commit be187e8ebd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Skinning/Editor/SkinEditor.cs
View File

@ -38,6 +38,8 @@ namespace osu.Game.Skinning.Editor
[Resolved]
private OsuColour colours { get; set; }
private bool hasBegunMutating;
public SkinEditor(Drawable targetScreen)
{
this.targetScreen = targetScreen;
@ -139,7 +141,11 @@ namespace osu.Game.Skinning.Editor
// schedule ensures this only happens when the skin editor is visible.
// also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
// probably something which will be factored out in a future database refactor so not too concerning for now.
currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
currentSkin.BindValueChanged(skin =>
{
hasBegunMutating = false;
Scheduler.AddOnce(skinChanged);
}, true);
}
private void skinChanged()
@ -161,6 +167,7 @@ namespace osu.Game.Skinning.Editor
});
skins.EnsureMutableSkin();
hasBegunMutating = true;
}
private void placeComponent(Type type)
@ -194,6 +201,9 @@ namespace osu.Game.Skinning.Editor
public void Save()
{
if (!hasBegunMutating)
return;
SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
foreach (var t in targetContainers)