Merge branch 'master' into i-notification-overlay

This commit is contained in:
Dan Balasescu
2022-04-19 06:03:56 +09:00
committed by GitHub
13 changed files with 48 additions and 24 deletions

View File

@ -148,14 +148,14 @@ namespace osu.Game.Screens.Menu
}
[Resolved(canBeNull: true)]
private OsuGame game { get; set; }
private IPerformFromScreenRunner performer { get; set; }
private void confirmAndExit()
{
if (exitConfirmed) return;
exitConfirmed = true;
game?.PerformFromScreen(menu => menu.Exit());
performer?.PerformFromScreen(menu => menu.Exit());
}
private void preloadSongSelect()