Merge branch 'master' into async-beatmap-load

This commit is contained in:
Dan Balasescu
2019-07-02 23:19:10 +09:30
committed by GitHub
11 changed files with 140 additions and 58 deletions

View File

@ -51,6 +51,11 @@ namespace osu.Game.Beatmaps
total_count.Value++;
}
~WorkingBeatmap()
{
Dispose(false);
}
protected virtual Track GetVirtualTrack()
{
const double excess_length = 1000;
@ -248,7 +253,6 @@ namespace osu.Game.Beatmaps
// cancelling the beatmap load is safe for now since the retrieval is a synchronous
// operation. if we add an async retrieval method this may need to be reconsidered.
beatmapCancellation.Cancel();
total_count.Value--;
}