diff options
Diffstat (limited to 'mpvcore/player/main.c')
| -rw-r--r-- | mpvcore/player/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c index 34383f4264..4119e244c3 100644 --- a/mpvcore/player/main.c +++ b/mpvcore/player/main.c @@ -419,6 +419,9 @@ static int mpv_main(int argc, char *argv[]) if (opts->shuffle) playlist_shuffle(mpctx->playlist); + if (opts->merge_files) + merge_playlist_files(mpctx->playlist); + mpctx->playlist->current = mp_resume_playlist(mpctx->playlist, opts); if (!mpctx->playlist->current) mpctx->playlist->current = mpctx->playlist->first; |