aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src/fccfg.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-17 09:25:28 +0100
committermarha <marha@users.sourceforge.net>2013-01-17 09:25:28 +0100
commit50c07563e17397daf040a32d8fdd3ab397e72371 (patch)
treeae9c109e16ba86a498c43ab62830bca3641a78aa /fontconfig/src/fccfg.c
parentdc163f625ef006c8550791122bda28fb3eb67e3d (diff)
parent4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff)
downloadvcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.gz
vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.bz2
vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libxcb mesa xkbcomp git update 17 jan 2013
Diffstat (limited to 'fontconfig/src/fccfg.c')
-rw-r--r--fontconfig/src/fccfg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c
index 3e9fdaba4..12d7e1a97 100644
--- a/fontconfig/src/fccfg.c
+++ b/fontconfig/src/fccfg.c
@@ -337,8 +337,8 @@ FcConfigAddCache (FcConfig *config, FcCache *cache,
if (!FcConfigAcceptFont (config, font))
continue;
- nref++;
- FcFontSetAdd (config->fonts[set], font);
+ if (FcFontSetAdd (config->fonts[set], font))
+ nref++;
}
FcDirCacheReference (cache, nref);
}