Mercurial > mplayer.hg
diff cfg-common.h @ 34169:9b617726812c
Sanitize include behaviour.
The normal func_param argument type will iterate over all previous
values each time a new value is assigned.
This leads e.g. to a complete mess and non-working recursion limiting
when creating a config file that includes itself.
Seem to also fix bug #1994.
author | reimar |
---|---|
date | Tue, 25 Oct 2011 20:18:35 +0000 |
parents | 09bdaa0c82b3 |
children | 9ba2da76a0e0 |
line wrap: on
line diff
--- a/cfg-common.h Tue Oct 25 19:22:10 2011 +0000 +++ b/cfg-common.h Tue Oct 25 20:18:35 2011 +0000 @@ -305,7 +305,7 @@ #ifdef CONFIG_ICONV {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, + {"include", cfg_include, CONF_TYPE_FUNC_PARAM_IMMEDIATE, CONF_NOSAVE, 0, 0, NULL}, #ifdef CONFIG_PRIORITY {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif