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

Merge branch 'master' into overall-difficulty

Browse Source
This commit is contained in:
Dan Balasescu
2018-01-22 13:50:37 +09:00
committed by GitHub
parent 29466438a3 1200ee5a54
commit 81635c8310
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 8f36ddab94...26c01ca606

2
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -106,6 +106,8 @@ namespace osu.Game.Overlays.Direct
beatmaps.BeatmapDownloadBegan += attachDownload; beatmaps.BeatmapDownloadBegan += attachDownload;
} }
public override bool DisposeOnDeathRemoval => true;
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);

6
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -145,6 +145,12 @@ namespace osu.Game.Overlays.Direct
} }
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
Playing.Value = false;
}
private TrackLoader trackLoader; private TrackLoader trackLoader;
private AudioManager audio; private AudioManager audio;