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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Susko3 2020-12-31 14:36:16 +01:00 committed by GitHub
commit 79755e1826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
View File

@ -7,12 +7,11 @@ namespace osu.Game.Overlays.Changelog
{ {
public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream> public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
{ {
protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value); public ChangelogUpdateStreamControl()
protected override void LoadComplete()
{ {
// suppress base logic of immediately selecting first item if one exists SelectFirstTabByDefault = false;
// (we always want to start with no stream selected).
} }
protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
} }
} }

14
osu.Game/PerformFromMenuRunner.cs
View File

@ -73,15 +73,19 @@ 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(); finalAction(current);
Cancel();
return; return;
} }
@ -135,11 +139,5 @@ namespace osu.Game
lastEncounteredDialogScreen = current; lastEncounteredDialogScreen = current;
return true; return true;
} }
private void complete()
{
finalAction(getCurrentScreen());
Cancel();
}
} }
} }