From cce69b07efd82056c8eb855ef7ac7e02c94439da Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 5 Jun 2009 17:15:53 -0400 Subject: [PATCH] Always set *changed in FcCharsetMerge --- src/fccharset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fccharset.c b/src/fccharset.c index fba1f4a..cba21c7 100644 --- a/src/fccharset.c +++ b/src/fccharset.c @@ -470,8 +470,11 @@ FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed) int ai = 0, bi = 0; FcChar16 an, bn; - if (a->ref == FC_REF_CONSTANT) + if (a->ref == FC_REF_CONSTANT) { + if (changed) + *changed = FcFalse; return FcFalse; + } if (changed) { *changed = !FcCharSetIsSubset(b, a); -- 2.39.2