From c4fc87b69a6acfaf94afecad4d0f45d3cf0d190c Mon Sep 17 00:00:00 2001 From: Roman Kapustin Date: Sat, 17 Nov 2018 15:39:40 +0300 Subject: [PATCH] Move to next track on Completed event --- osu.Game/Overlays/MusicController.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index f282b757cd..790aab16d0 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -253,9 +253,6 @@ namespace osu.Game.Overlays progressBar.CurrentTime = track.CurrentTime; playButton.Icon = track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o; - - if (track.HasCompleted && !track.Looping && !beatmap.Disabled && beatmapSets.Any()) - next(); } else { @@ -333,9 +330,13 @@ namespace osu.Game.Overlays direction = last > next ? TransformDirection.Prev : TransformDirection.Next; } + + current.Track.Completed -= currentTrackCompleted; } current = beatmap; + if (current != null) + current.Track.Completed += currentTrackCompleted; progressBar.CurrentTime = 0; @@ -344,6 +345,12 @@ namespace osu.Game.Overlays queuedDirection = null; } + private void currentTrackCompleted() + { + if (!beatmap.Disabled && beatmapSets.Any()) + next(); + } + private ScheduledDelegate pendingBeatmapSwitch; private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)