1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-24 04:33:15 +08:00

Merge pull request #17506 from peppy/fix-skin-editor-exit

Fix skin editor not exiting correctly when using the menu
This commit is contained in:
Bartłomiej Dach 2022-03-28 16:36:47 +02:00 committed by GitHub
commit 9ceceeca3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,6 +42,9 @@ namespace osu.Game.Skinning.Editor
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
[Resolved(canBeNull: true)]
private SkinEditorOverlay skinEditorOverlay { get; set; }
[Cached] [Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue); private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
@ -107,7 +110,7 @@ namespace osu.Game.Skinning.Editor
new EditorMenuItem("Save", MenuItemType.Standard, Save), new EditorMenuItem("Save", MenuItemType.Standard, Save),
new EditorMenuItem("Revert to default", MenuItemType.Destructive, revert), new EditorMenuItem("Revert to default", MenuItemType.Destructive, revert),
new EditorMenuItemSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Exit", MenuItemType.Standard, Hide), new EditorMenuItem("Exit", MenuItemType.Standard, () => skinEditorOverlay?.Hide()),
}, },
}, },
} }