sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Balasescu
2019-02-28 12:23:37 +09:00
committed by GitHub
parent 9f8d03e1b6 05aa80b184
commit 76ec5868da
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Select/SongSelect.cs
View File

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

3
osu.Game/Skinning/LocalSkinOverrideContainer.cs
View File

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