Merge branch 'master' into backgrounded-beatmap-status-lookups

This commit is contained in:
Dean Herbert
2019-06-12 00:22:47 +09:00
committed by GitHub
73 changed files with 258 additions and 231 deletions

View File

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