diff --git a/VERSION b/VERSION index d8d0e78..e5777e5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.293 +1.5.294 diff --git a/base/netgen.c b/base/netgen.c index 32b0177..844da03 100644 --- a/base/netgen.c +++ b/base/netgen.c @@ -2248,7 +2248,10 @@ int PromoteProperty(struct property *prop, struct valuelist *vl, if (prop == NULL || vl == NULL) return -1; if (prop->type == vl->type) return 1; /* Nothing to do */ result = 0; - if (prop->type == PROP_EXPRESSION) { + /* If vl is an expression but prop is not, then try to reduce + * the expression in vl. + */ + if (vl->type == PROP_EXPRESSION) { ReduceOneExpression(vl, ob, tc, FALSE); } switch (prop->type) {