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

Refactor editor exit sequence to avoid any scenario where a dialog could go stray

Browse Source
This commit is contained in:
Dean Herbert 2021-05-19 16:28:25 +09:00
parent b83322281e
commit 44e22b31a9
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game/Screens/Edit/Editor.cs
View File

@ -473,25 +473,23 @@ namespace osu.Game.Screens.Edit
{
if (!exitConfirmed)
{
// if the confirm dialog is already showing (or we can't show it, ie. in tests) exit without save.
if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
// dialog overlay may not be available in visual tests.
if (dialogOverlay == null)
{
confirmExit();
return base.OnExiting(next);
return true;
}
// if the dialog is already displayed, confirm exit with no save.
if (dialogOverlay.CurrentDialog is PromptForSaveDialog saveDialog)
{
saveDialog.PerformOkAction();
return true;
}
if (isNewBeatmap || HasUnsavedChanges)
{
dialogOverlay?.Push(new PromptForSaveDialog(() =>
{
confirmExit();
this.Exit();
}, () =>
{
confirmExitWithSave();
this.Exit();
}));
dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
return true;
}
}
@ -506,8 +504,10 @@ namespace osu.Game.Screens.Edit
private void confirmExitWithSave()
{
exitConfirmed = true;
Save();
exitConfirmed = true;
this.Exit();
}
private void confirmExit()
@ -529,6 +529,7 @@ namespace osu.Game.Screens.Edit
}
exitConfirmed = true;
this.Exit();
}
private readonly Bindable<string> clipboard = new Bindable<string>();