diff options
author | wm4 <wm4@nowhere> | 2013-11-03 19:22:13 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-03 19:22:13 +0100 |
commit | 388f43f6f7f4ad29dbd2626f07a15b8c1f6f9233 (patch) | |
tree | 795d21339ae214744b817502f3a1d5f1b627d135 /mpvcore/player/loadfile.c | |
parent | a49ab7cc2f9548edcfdd8ad9874050bd41e0b551 (diff) | |
download | mpv-388f43f6f7f4ad29dbd2626f07a15b8c1f6f9233.tar.bz2 mpv-388f43f6f7f4ad29dbd2626f07a15b8c1f6f9233.tar.xz |
player: fix quvi 0.9 playlist loading
The code made no sense at all.
Diffstat (limited to 'mpvcore/player/loadfile.c')
-rw-r--r-- | mpvcore/player/loadfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mpvcore/player/loadfile.c b/mpvcore/player/loadfile.c index 876994ac93..d6347e24c1 100644 --- a/mpvcore/player/loadfile.c +++ b/mpvcore/player/loadfile.c @@ -894,8 +894,9 @@ static void print_resolve_contents(struct mp_log *log, // 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 { |