Merge branch 'master' into editor-clipboard

This commit is contained in:
Dean Herbert 2020-09-11 20:35:05 +09:00
commit 08be45c9e7

View File

@ -403,7 +403,7 @@ namespace osu.Game.Screens.Edit
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges) if (!exitConfirmed && dialogOverlay != null && HasUnsavedChanges && !(dialogOverlay.CurrentDialog is PromptForSaveDialog))
{ {
dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave)); dialogOverlay?.Push(new PromptForSaveDialog(confirmExit, confirmExitWithSave));
return true; return true;