1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 19:12:57 +08:00

Merge branch 'master' into fix-multiplayer-audio

This commit is contained in:
Dean Herbert 2019-06-19 14:36:05 +09:00 committed by GitHub
commit 3043f42eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,7 +28,7 @@ namespace osu.Game.Screens.Menu
{ {
private ButtonSystem buttons; private ButtonSystem buttons;
public override bool HideOverlaysOnEnter => buttons.State == ButtonSystemState.Initial; public override bool HideOverlaysOnEnter => buttons == null || buttons.State == ButtonSystemState.Initial;
protected override bool AllowBackButton => buttons.State != ButtonSystemState.Initial && host.CanExit; protected override bool AllowBackButton => buttons.State != ButtonSystemState.Initial && host.CanExit;