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

Merge https://github.com/ppy/osu into online-beatmap-set-overlay

Browse Source
This commit is contained in:
DrabWeb
2017-09-12 21:26:06 -03:00
parent 680f2e232c 452506d982
commit 08b5d4e16c
113 changed files with 2251 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -87,7 +87,9 @@ namespace osu.Game.Beatmaps
{
if (track != null) return track;
track = GetTrack();
// we want to ensure that we always have a track, even if it's a fake one.
track = GetTrack() ?? new TrackVirtual();
applyRateAdjustments();
return track;
}
@ -107,10 +109,17 @@ namespace osu.Game.Beatmaps
public virtual void Dispose()
{
track?.Dispose();
track = null;
background?.Dispose();
background = null;
}
public void DisposeTrack()
{
lock (trackLock)
{
track?.Dispose();
track = null;
}
}
}
}