From 5d31e7e7d2d524279fe2ae857901ceb73ff6e7b2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 23 Jan 2009 06:28:46 +0100 Subject: playlist: removed unreachable "playing" check In playPlaylist(), the second "song==-1 && playing" check can never be reached, because at this point, the function has already returned (after unpausing). --- src/playlist.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/playlist.c b/src/playlist.c index 9e44add67..6fb0e9227 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -703,19 +703,15 @@ enum playlist_result playPlaylist(int song) return PLAYLIST_RESULT_BAD_RANGE; if (playlist.queue.random) { - if (song == -1 && playlist.playing) { - queue_shuffle_order(&playlist.queue); - } else { - if (song >= 0) - i = queue_position_to_order(&playlist.queue, song); + if (song >= 0) + i = queue_position_to_order(&playlist.queue, song); - if (!playlist.playing) - playlist.current = 0; + if (!playlist.playing) + playlist.current = 0; - queue_swap_order(&playlist.queue, - i, playlist.current); - i = playlist.current; - } + queue_swap_order(&playlist.queue, + i, playlist.current); + i = playlist.current; } playlist_stopOnError = false; -- cgit v1.2.3