From 9cc5dc6c2b90b861cafa70f51df0755cb0dd1bb3 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Mon, 19 Jun 2017 15:03:07 +0200 Subject: [PATCH] Only disallow changing the current track, not pausing or seeking it --- osu.Game/Overlays/MusicController.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 3c91b8de41..2d2cdd1b23 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -225,11 +225,8 @@ namespace osu.Game.Overlays canChangeBeatmap = newScreen?.CanChangeBeatmap ?? true; prevButton.Enabled = canChangeBeatmap; - playButton.Enabled = canChangeBeatmap; nextButton.Enabled = canChangeBeatmap; playlistButton.Enabled = canChangeBeatmap; - - progressBar.IsEnabled = canChangeBeatmap; } protected override void UpdateAfterChildren() @@ -249,7 +246,7 @@ namespace osu.Game.Overlays progressBar.UpdatePosition(track.Length == 0 ? 0 : (float)(track.CurrentTime / track.Length)); playButton.Icon = track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o; - if (track.HasCompleted && !track.Looping) next(); + if (track.HasCompleted && !track.Looping && canChangeBeatmap) next(); } else playButton.Icon = FontAwesome.fa_play_circle_o; @@ -273,16 +270,12 @@ namespace osu.Game.Overlays private void prev() { - if(!canChangeBeatmap) return; - queuedDirection = TransformDirection.Prev; playlist.PlayPrevious(); } private void next() { - if (!canChangeBeatmap) return; - queuedDirection = TransformDirection.Next; playlist.PlayNext(); }