Merge remote-tracking branch 'origin/master' into selection-update

This commit is contained in:
smoogipoo
2019-06-12 15:10:57 +09:00
75 changed files with 271 additions and 234 deletions

View File

@ -278,7 +278,7 @@ namespace osu.Game.Screens.Select
protected virtual void ExitFromBack()
{
if (ModSelect.State == Visibility.Visible)
if (ModSelect.State.Value == Visibility.Visible)
{
ModSelect.Hide();
return;
@ -520,7 +520,7 @@ namespace osu.Game.Screens.Select
if (base.OnExiting(next))
return true;
beatmapInfoWedge.State = Visibility.Hidden;
beatmapInfoWedge.Hide();
this.FadeOut(100);