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

Add extra extra safety against attempting to load a previously expired editor

Browse Source
This commit is contained in:
Dean Herbert 2021-12-30 16:02:08 +09:00
parent b1a444180f
commit ef49f2ed0e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,15 +73,23 @@ namespace osu.Game.Skinning.Editor
var editor = new SkinEditor(target); var editor = new SkinEditor(target);
editor.State.BindValueChanged(editorVisibilityChanged); editor.State.BindValueChanged(editorVisibilityChanged);
skinEditor = editor;
// 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(editor != null); if (editor != skinEditor)
LoadComponentAsync(editor, AddInternal); return;
});
skinEditor = editor; LoadComponentAsync(editor, _ =>
{
if (editor != skinEditor)
return;
AddInternal(editor);
});
});
} }
else else
skinEditor.Show(); skinEditor.Show();