Merge branch 'master' into disable-waveform-testcase

This commit is contained in:
Dean Herbert
2018-01-22 13:53:59 +09:00
committed by GitHub
3 changed files with 9 additions and 1 deletions

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);

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;