sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects 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
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

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

@ -236,8 +236,8 @@ namespace osu.Game.Overlays
{ {
if (beatmap is Bindable<WorkingBeatmap> working) if (beatmap is Bindable<WorkingBeatmap> working)
working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value); working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
beatmap.Value.Track.Restart();
restartTrack();
return PreviousTrackResult.Previous; return PreviousTrackResult.Previous;
} }
@ -262,13 +262,21 @@ namespace osu.Game.Overlays
{ {
if (beatmap is Bindable<WorkingBeatmap> working) if (beatmap is Bindable<WorkingBeatmap> working)
working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value); working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
beatmap.Value.Track.Restart();
restartTrack();
return true; return true;
} }
return false; 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 WorkingBeatmap current;
private TrackChangeDirection? queuedDirection; private TrackChangeDirection? queuedDirection;