summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-11 00:04:49 +0200
committerwm4 <wm4@nowhere>2016-09-11 00:04:49 +0200
commit71681e04ee956a64f2d6e067f3540ea918a16b61 (patch)
tree9378248e4ad79ef3ff6283698fbd1c7418991a2a /options
parent440e0a98abdc9484f0967b47f4149180e8dff4e9 (diff)
downloadmpv-71681e04ee956a64f2d6e067f3540ea918a16b61.tar.bz2
mpv-71681e04ee956a64f2d6e067f3540ea918a16b61.tar.xz
options: fix another minor regression
vf_scale's "h" sub-option was interpreted as "--h".
Diffstat (limited to 'options')
-rw-r--r--options/m_config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/options/m_config.c b/options/m_config.c
index 6992ca8c25..ff8700d0e0 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -774,7 +774,8 @@ static int m_config_parse_option(struct m_config *config, struct bstr name,
return parse_profile(config, co->opt, name, param, set, flags);
if (config->use_profiles && bstr_equals0(name, "show-profile"))
return show_profile(config, param);
- if (bstr_equals0(name, "h") || bstr_equals0(name, "help"))
+ if (config->is_toplevel && (bstr_equals0(name, "h") ||
+ bstr_equals0(name, "help")))
return list_options(config, param, true);
if (bstr_equals0(name, "list-options"))
return list_options(config, bstr0("*"), false);