RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename and clarify comment regarding "previous" track disposal

This commit is contained in:
Dean Herbert 2020-08-22 19:44:54 +09:00
parent b72f06fef6
commit db52260427
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/MusicController.cs
View File

@ -331,10 +331,10 @@ private void changeTrack()
{
var lastTrack = CurrentTrack;
var newTrack = new DrawableTrack(current.LoadTrack());
newTrack.Completed += () => onTrackCompleted(current);
var queuedTrack = new DrawableTrack(current.LoadTrack());
queuedTrack.Completed += () => onTrackCompleted(current);
CurrentTrack = newTrack;
CurrentTrack = queuedTrack;
// At this point we may potentially be in an async context from tests. This is extremely dangerous but we have to make do for now.
// CurrentTrack is immediately updated above for situations where a immediate knowledge about the new track is required,
@ -343,12 +343,13 @@ private void changeTrack()
{
lastTrack.Expire();
if (newTrack == CurrentTrack)
AddInternal(newTrack);
if (queuedTrack == CurrentTrack)
AddInternal(queuedTrack);
else
{
// If the track has changed via changeTrack() being called multiple times in a single update, force disposal on the old track.
newTrack.Dispose();
// If the track has changed since the call to changeTrack, it is safe to dispose the
// queued track rather than consume it.
queuedTrack.Dispose();
}
});
}