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

Fix editor crash on exit when forcing exit twice in a row

Browse Source
This commit is contained in:
Dean Herbert 2020-10-28 13:32:39 +09:00
parent df5348cd93
commit 01b576c861
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,12 +444,21 @@ namespace osu.Game.Screens.Edit
if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog) if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
{ {
confirmExit(); confirmExit();
return true; return false;
} }
if (isNewBeatmap || HasUnsavedChanges) if (isNewBeatmap || HasUnsavedChanges)
{ {
dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave)); dialogOverlay?.Push(new PromptForSaveDialog(() =>
{
confirmExit();
this.Exit();
}, () =>
{
confirmExitWithSave();
this.Exit();
}));
return true; return true;
} }
} }
@ -464,7 +473,6 @@ namespace osu.Game.Screens.Edit
{ {
exitConfirmed = true; exitConfirmed = true;
Save(); Save();
this.Exit();
} }
private void confirmExit() private void confirmExit()
@ -483,7 +491,6 @@ namespace osu.Game.Screens.Edit
} }
exitConfirmed = true; exitConfirmed = true;
this.Exit();
} }
private readonly Bindable<string> clipboard = new Bindable<string>(); private readonly Bindable<string> clipboard = new Bindable<string>();