1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-27 21:03:27 +08:00

Merge branch 'master' into overall-difficulty

This commit is contained in:
Dan Balasescu
2018-01-22 13:50:37 +09:00
committed by GitHub
Unverified
3 changed files with 9 additions and 1 deletions
+2
View File
@@ -106,6 +106,8 @@ namespace osu.Game.Overlays.Direct
beatmaps.BeatmapDownloadBegan += attachDownload;
}
public override bool DisposeOnDeathRemoval => true;
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
+6
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 AudioManager audio;