diff options
| author | wm4 <wm4@nowhere> | 2018-05-18 22:19:10 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
| commit | 76dc5d9aa92f5c91c728004214f7b08c3a85a5f6 (patch) | |
| tree | 5e7514e6376067c98645b921eb698381aa496b0b /options | |
| parent | 12d1404b04e90f5357882e5c1048d92305248cb9 (diff) | |
| download | mpv-76dc5d9aa92f5c91c728004214f7b08c3a85a5f6.tar.bz2 mpv-76dc5d9aa92f5c91c728004214f7b08c3a85a5f6.tar.xz | |
command: make loadlist command async and abortable
Don't allow it to freeze everything when loading a playlist from network
(although you definitely shouldn't do that, but whatever).
This also affects the really obscure --ordered-chapters-files option.
The --playlist option on the other hand has no choice but to freeze the
shit, because there's no concept of aborting the player during command
line parsing.
Diffstat (limited to 'options')
| -rw-r--r-- | options/parse_commandline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/parse_commandline.c b/options/parse_commandline.c index b1392ba4e1..68d36c6500 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -199,7 +199,7 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, if (bstrcmp0(p.arg, "playlist") == 0) { // append the playlist to the local args char *param0 = bstrdup0(NULL, p.param); - struct playlist *pl = playlist_parse_file(param0, global); + struct playlist *pl = playlist_parse_file(param0, NULL, global); talloc_free(param0); if (!pl) { MP_FATAL(config, "Error reading playlist '%.*s'\n", |