From e68fcbfa39c3eab692abc325fa08c32afb32b942 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 3 Nov 2013 19:22:13 +0100
Subject: player: fix quvi 0.9 playlist loading

The code made no sense at all.

Conflicts:
	mpvcore/player/loadfile.c
---
 mpvcore/mplayer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index 0049b57378..a4bfb3ea0c 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -4355,8 +4355,9 @@ static void stream_dump(struct MPContext *mpctx)
 // from the given playlist pl, so the entries don't actually need to be copied.
 static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl)
 {
-    if (mpctx->demuxer->playlist->first) {
-        playlist_transfer_entries(mpctx->playlist, mpctx->demuxer->playlist);
+    if (pl->first) {
+        playlist_transfer_entries(mpctx->playlist, pl);
+        // current entry is replaced
         if (mpctx->playlist->current)
             playlist_remove(mpctx->playlist, mpctx->playlist->current);
     } else {
-- 
cgit v1.2.3