h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Code Issues Releases Wiki Activity

Fix Show then Reset potentially resulting in incorrect load target

Browse Source
This commit is contained in:
Dean Herbert 2021-12-29 21:46:34 +09:00
parent 471eea750a
commit b1a444180f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Skinning/Editor/SkinEditorOverlay.cs
View File

@ -70,16 +70,18 @@ namespace osu.Game.Skinning.Editor
// base call intentionally omitted. // base call intentionally omitted.
if (skinEditor == null) if (skinEditor == null)
{ {
skinEditor = new SkinEditor(target); var editor = new SkinEditor(target);
skinEditor.State.BindValueChanged(editorVisibilityChanged); editor.State.BindValueChanged(editorVisibilityChanged);
// Schedule ensures that if `Show` is called before this overlay is loaded, // Schedule ensures that if `Show` is called before this overlay is loaded,
// it will not throw (LoadComponentAsync requires the load target to be in a loaded state). // it will not throw (LoadComponentAsync requires the load target to be in a loaded state).
Schedule(() => Schedule(() =>
{ {
Debug.Assert(skinEditor != null); Debug.Assert(editor != null);
LoadComponentAsync(skinEditor, AddInternal); LoadComponentAsync(editor, AddInternal);
}); });
skinEditor = editor;
} }
else else
skinEditor.Show(); skinEditor.Show();