Merge remote-tracking branch 'origin/master' into audio-refactor-update

This commit is contained in:
smoogipoo
2019-06-04 10:50:33 +09:00
25 changed files with 1396 additions and 22 deletions

View File

@ -176,7 +176,7 @@ namespace osu.Game.Screens.Menu
private void updateIdleState(bool isIdle)
{
if (isIdle && State != ButtonSystemState.Exit)
if (isIdle && State != ButtonSystemState.Exit && State != ButtonSystemState.EnteringMode)
State = ButtonSystemState.Initial;
}