From 76dc5d9aa92f5c91c728004214f7b08c3a85a5f6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 18 May 2018 22:19:10 +0200 Subject: 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. --- options/parse_commandline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options') 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", -- cgit v1.2.3