RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 02:52:10 +00:00
Code Issues Releases Wiki Activity

options: fix --list-options after previous commit

Browse Source 
Fixes #3509.
This commit is contained in:
wm4 2016-09-10 20:49:10 +02:00
parent 484328fe04
commit fc1c004cd8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
options/m_config.c
View File

@ -184,7 +184,8 @@ static int list_options(struct m_config *config, bstr val, bool show_help)
snprintf(s, sizeof(s), "%.*s", BSTR_P(val));
if (show_help)
mp_info(config->log, "%s", mp_help_text);
m_config_print_option_list(config, s);
if (s[0])
m_config_print_option_list(config, s);
return M_OPT_EXIT;
}
@ -776,7 +777,7 @@ static int m_config_parse_option(struct m_config *config, struct bstr name,
if (bstr_equals0(name, "h") || bstr_equals0(name, "help"))
return list_options(config, param, true);
if (bstr_equals0(name, "list-options"))
return list_options(config, (bstr){0}, false);
return list_options(config, bstr0("*"), false);
// Option with children are a bit different to parse
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) {

2
options/m_option.c
View File

@ -2771,7 +2771,7 @@ print_help: ;
if (config) {
if (desc->print_help)
desc->print_help(log);
m_config_print_option_list(config, "");
m_config_print_option_list(config, "*");
} else {
mp_warn(log, "Option %.*s: item %.*s doesn't exist.\n",
BSTR_P(opt_name), BSTR_P(name));