From 05e6402dc6717e9e51d0f03dac1cc7efe7e2bf8f Mon Sep 17 00:00:00 2001 From: chme Date: Sat, 2 Aug 2014 07:20:38 +0200 Subject: [PATCH] Fix skip to next song while the last song in Up Next is playing (introduced in a6c2a25) --- src/player.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/player.c b/src/player.c index 4d0101b8..ceb1004b 100644 --- a/src/player.c +++ b/src/player.c @@ -1085,6 +1085,7 @@ source_reshuffle(void) source_shuffle(head, tail); + // Setting shuffle_head to the current song (head) will show all reshuffled songs in the playlist if (repeat == REPEAT_ALL) shuffle_head = head; } @@ -1230,7 +1231,12 @@ source_next(int force) if (cur_streaming && (ps == shuffle_head)) { source_reshuffle(); - ps = shuffle_head; + + /* After source_reshuffle with "repeat all", shuffle_head is (re-)set to cur_streaming, + * therefor get the next song in queue and set the start of the playlist to this song. + */ + ps = cur_streaming->shuffle_next; + shuffle_head = ps; } limit = shuffle_head;