Merge pull request #28 from chme/fixaddnext

Fix crash when calling add-next and cur_playing/cur_streaming are NULL
2014-05-17 20:23:04 +02:00 · 2014-05-17 20:23:04 +02:00 · 66a8cad434
parent 1e2f7b0c5e a1b09903c0
commit 66a8cad434
1 changed files with 2 additions and 2 deletions
--- a/src/player.c
+++ b/src/player.c
@ -3429,9 +3429,9 @@ queue_add_next(struct player_command *cmd)
  if (!ps_shuffle)
    ps_shuffle = ps;

-  if (source_head)
+  if (source_head && cur_streaming)
  {
-    ps_playing = cur_playing ? cur_playing : cur_streaming;
+    ps_playing = cur_streaming;

    // Insert ps after ps_playing
    ps->pl_prev->pl_next = ps_playing->pl_next;