oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge release 0.15.8 from branch 'v0.15.x

Browse Source 
Conflicts:
	Makefile.am
	NEWS
	configure.ac
	src/decoder/ffmpeg_decoder_plugin.c
	src/decoder_thread.c
This commit is contained in:
Max Kellermann
2010-01-18 07:52:58 +01:00
parent 9d4b7ab113 760569fc66
commit a0a26d3341
4 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/queue.c
View File

@@ -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