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

Fix PerformFromMenuRunner failing if CurrentScreen is null

Browse Source
This commit is contained in:
Dean Herbert 2020-12-31 16:36:20 +09:00
parent 575a00dd7d
commit f9196ae976
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/PerformFromMenuRunner.cs
View File

@ -73,13 +73,16 @@ namespace osu.Game
// find closest valid target // find closest valid target
IScreen current = getCurrentScreen(); IScreen current = getCurrentScreen();
if (current == null)
return;
// a dialog may be blocking the execution for now. // a dialog may be blocking the execution for now.
if (checkForDialog(current)) return; if (checkForDialog(current)) return;
game?.CloseAllOverlays(false); game?.CloseAllOverlays(false);
// we may already be at the target screen type. // we may already be at the target screen type.
if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled) if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
{ {
complete(); complete();
return; return;