Always set *changed in FcCharsetMerge

[fontconfig.git] / src / fccharset.c

diff --git a/src/fccharset.c b/src/fccharset.c
index fba1f4ab4a3b6bc573046b798c9855596f9d6ff7..cba21c771f05a86a0a5f29c36759da972ca3583f 100644 (file)
--- 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);