h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 23:23:12 +08:00
Code Issues Releases Wiki Activity

Consider SubScreenStacks when allowing for exit confirmation sequence in PerformFromMenuRunner

Browse Source
This commit is contained in:
Dean Herbert 2022-04-14 16:03:34 +09:00
parent f9d9e6aa61
commit 2bc4bb9e20
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/PerformFromMenuRunner.cs
View File

@ -125,6 +125,18 @@ namespace osu.Game
/// <returns>Whether a dialog blocked interaction.</returns> /// <returns>Whether a dialog blocked interaction.</returns>
private bool checkForDialog(IScreen current) private bool checkForDialog(IScreen current)
{ {
// An exit process may traverse multiple levels.
// When checking for dismissing dialogs, let's also consider sub screens.
while (current is IHasSubScreenStack currentWithSubScreenStack)
{
var nestedCurrent = currentWithSubScreenStack.SubScreenStack.CurrentScreen;
if (nestedCurrent == null)
break;
current = nestedCurrent;
}
var currentDialog = dialogOverlay.CurrentDialog; var currentDialog = dialogOverlay.CurrentDialog;
if (lastEncounteredDialog != null) if (lastEncounteredDialog != null)