diff options
| author | wm4 <wm4@nowhere> | 2013-11-03 19:22:13 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-07 23:57:05 +0100 |
| commit | e68fcbfa39c3eab692abc325fa08c32afb32b942 (patch) | |
| tree | 824a19c273fb05cffc98a87bdbf37590c388823f | |
| parent | 391c087d752b5caa5f246b1891d654dd0a65f394 (diff) | |
| download | mpv-e68fcbfa39c3eab692abc325fa08c32afb32b942.tar.bz2 mpv-e68fcbfa39c3eab692abc325fa08c32afb32b942.tar.xz | |
player: fix quvi 0.9 playlist loading
The code made no sense at all.
Conflicts:
mpvcore/player/loadfile.c
| -rw-r--r-- | mpvcore/mplayer.c | 5 |
1 files 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 { |