[player] Fix for #860, going to next track when consume is enabled

This commit is contained in:
ejurgensen 2019-12-17 20:58:47 +01:00
parent 60920343ff
commit 33f97f55f3

View File

@ -2143,9 +2143,6 @@ playback_next_bh(void *arg, int *retval)
worker_execute(skipcount_inc_cb, &id, sizeof(int), 5); worker_execute(skipcount_inc_cb, &id, sizeof(int), 5);
} }
if (consume)
db_queue_delete_byitemid(pb_session.playing_now->item_id);
queue_item = queue_item_next(pb_session.playing_now->item_id); queue_item = queue_item_next(pb_session.playing_now->item_id);
if (!queue_item) if (!queue_item)
{ {
@ -2153,6 +2150,9 @@ playback_next_bh(void *arg, int *retval)
goto error; goto error;
} }
if (consume)
db_queue_delete_byitemid(pb_session.playing_now->item_id);
ret = pb_session_start(queue_item, 0); ret = pb_session_start(queue_item, 0);
free_queue_item(queue_item, 0); free_queue_item(queue_item, 0);
if (ret < 0) if (ret < 0)