diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 857d072417..a715967afd 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -990,6 +990,8 @@ The following expansions are supported: Expand to the value of the property NAME. .IPs ?(NAME:TEXT) Expand TEXT only if the property NAME is available. +.IPs ?(!NAME:TEXT) +Expand TEXT only if the property NAME is not available. .RE . .TP diff --git a/m_property.c b/m_property.c index 2b9b04d4d7..d5e40bcd6c 100644 --- a/m_property.c +++ b/m_property.c @@ -146,11 +146,16 @@ char* m_properties_expand_string(m_option_t* prop_list,char* str, void *ctx) { } else if(str[0] == '?' && str[1] == '(' && (e = strchr(str+2,':'))) { lvl++; if(!skip) { - int pl = e-str-2; + int is_not = str[2] == '!'; + int pl = e - str - (is_not ? 3 : 2); char pname[pl+1]; - memcpy(pname,str+2,pl); + memcpy(pname, str + (is_not ? 3 : 2), pl); pname[pl] = 0; - if(m_property_do(prop_list,pname,M_PROPERTY_GET,NULL,ctx) < 0) + if(m_property_do(prop_list,pname,M_PROPERTY_GET,NULL,ctx) < 0) { + if (!is_not) + skip = 1, skip_lvl = lvl; + } + else if (is_not) skip = 1, skip_lvl = lvl; } str = e+1, l = 0;