diff options
| author | Max Kellermann <max@duempel.org> | 2010-01-18 07:52:58 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-01-18 07:52:58 +0100 |
| commit | a0a26d3341022552984a3307393a8f701f350edc (patch) | |
| tree | 730fca6b454e43ab27ae3b73b3783eba4f0a7baa /src/queue.c | |
| parent | 9d4b7ab11305d8a95fcf93ffaedf0bdea0356927 (diff) | |
| parent | 760569fc66fca6d866d0692e0212f56458f4180c (diff) | |
| download | mpd-a0a26d3341022552984a3307393a8f701f350edc.tar.gz mpd-a0a26d3341022552984a3307393a8f701f350edc.tar.xz mpd-a0a26d3341022552984a3307393a8f701f350edc.zip | |
Merge release 0.15.8 from branch 'v0.15.x
Conflicts:
Makefile.am
NEWS
configure.ac
src/decoder/ffmpeg_decoder_plugin.c
src/decoder_thread.c
Diffstat (limited to 'src/queue.c')
| -rw-r--r-- | src/queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/queue.c b/src/queue.c index 56449bb3f..d847f1138 100644 --- a/src/queue.c +++ b/src/queue.c @@ -46,14 +46,14 @@ queue_next_order(const struct queue *queue, unsigned order) if (queue->single) { - if (queue->repeat) + if (queue->repeat && !queue->consume) return order; else return -1; } if (order + 1 < queue->length) return order + 1; - else if (queue->repeat) + else if (queue->repeat && (order > 0 || !queue->consume)) /* restart at first song */ return 0; else |