From 889cbc21b1cf69d529b65e5cc8d7193320ad7f8d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 10 Apr 2013 17:16:49 +0200
Subject: command: fix loadlist command

A simple inverted condition prevented it from working properly.

Also, make sure that playlist is played from beginning when the playlist
is replaced.
---
 core/command.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/command.c b/core/command.c
index 66198de166..095e50f4a2 100644
--- a/core/command.c
+++ b/core/command.c
@@ -1945,14 +1945,16 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
         char *filename = cmd->args[0].v.s;
         bool append = cmd->args[1].v.i;
         struct playlist *pl = playlist_parse_file(filename);
-        if (!pl) {
+        if (pl) {
             if (!append)
                 playlist_clear(mpctx->playlist);
             playlist_transfer_entries(mpctx->playlist, pl);
             talloc_free(pl);
 
-            if (!append)
-                mpctx->stop_play = PT_NEXT_ENTRY;
+            if (!append) {
+                mpctx->playlist->current = mpctx->playlist->first;
+                mpctx->stop_play = PT_CURRENT_ENTRY;
+            }
         } else {
             mp_tmsg(MSGT_CPLAYER, MSGL_ERR,
                     "\nUnable to load playlist %s.\n", filename);
-- 
cgit v1.2.3