h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 20:20:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #9731 from peppy/fix-multiple-tracks-playing

Browse Source 
Fix next track starting occasionally starting before previous one is paused
This commit is contained in:
Dan Balasescu
2020-07-31 22:53:02 +09:00
committed by GitHub
Unverified
parent e2baa0e5cb e8f75a78e8
commit a413f5f0dc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Overlays/MusicController.cs
+10 -2
View File
@@ -236,8 +236,8 @@ namespace osu.Game.Overlays
{
if (beatmap is Bindable<WorkingBeatmap> working)
working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
beatmap.Value.Track.Restart();
restartTrack();
return PreviousTrackResult.Previous;
}
@@ -262,13 +262,21 @@ namespace osu.Game.Overlays
{
if (beatmap is Bindable<WorkingBeatmap> working)
working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
beatmap.Value.Track.Restart();
restartTrack();
return true;
}
return false;
}
private void restartTrack()
{
// if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
// we probably want to move this to a central method for switching to a new working beatmap in the future.
Schedule(() => beatmap.Value.Track.Restart());
}
private WorkingBeatmap current;
private TrackChangeDirection? queuedDirection;