From 9134169e3792488d6525150e41b8427a3faeda33 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 7 Mar 2010 18:58:44 +0100 Subject: [PATCH] playlist: fix single+repeat in random mode With single+repeat enabled, it is expected that MPD repeats the current song over andd over. With random mode also enabled, this didn't work, because the song order was shuffled internally. This patch adds a special check for this case. --- NEWS | 1 + src/playlist.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 476553ff5..7723350ff 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.15.9 (2009/??/??) * decoders: - mad: fix crash when seeking at end of song +* playlist: fix single+repeat in random mode ver 0.15.8 (2010/01/17) diff --git a/src/playlist.c b/src/playlist.c index 35c09329a..660dd6a83 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -140,7 +140,8 @@ playlist_update_queued_song(struct playlist *playlist, const struct song *prev) ? queue_next_order(&playlist->queue, playlist->current) : 0; - if (next_order == 0 && playlist->queue.random) { + if (next_order == 0 && playlist->queue.random && + !playlist->queue.single) { /* shuffle the song order again, so we get a different order each time the playlist is played completely */