Merge branch 'master' into safe-screen-lease

This commit is contained in:
Dan Balasescu
2020-02-03 18:18:13 +09:00
committed by GitHub
66 changed files with 1223 additions and 546 deletions

View File

@ -33,6 +33,8 @@ namespace osu.Game.Screens.Select
public override void OnResuming(IScreen last)
{
base.OnResuming(last);
player = null;
if (removeAutoModOnResume)
@ -41,8 +43,6 @@ namespace osu.Game.Screens.Select
ModSelect.DeselectTypes(new[] { autoType }, true);
removeAutoModOnResume = false;
}
base.OnResuming(last);
}
protected override bool OnStart()