Merge branch 'master' into fix-square-graph-overhead

This commit is contained in:
Dan Balasescu
2019-02-28 12:23:37 +09:00
committed by GitHub
2 changed files with 3 additions and 6 deletions

View File

@ -512,12 +512,6 @@ namespace osu.Game.Screens.Select
if (base.OnExiting(next))
return true;
if (ModSelect.State == Visibility.Visible)
{
ModSelect.Hide();
return true;
}
beatmapInfoWedge.State = Visibility.Hidden;
this.FadeOut(100);

View File

@ -89,6 +89,9 @@ namespace osu.Game.Skinning
protected override void Dispose(bool isDisposing)
{
// Must be done before base.Dispose()
SourceChanged = null;
base.Dispose(isDisposing);
if (fallbackSource != null)