diff options
author | marha <marha@users.sourceforge.net> | 2012-12-12 08:39:09 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-12-12 08:39:09 +0100 |
commit | c648afe73ef43a15094508d2dd439e05738735bf (patch) | |
tree | 6d69f2726eb57d22395ffbe0b7733eebc16d1bb1 /fontconfig/src/fccfg.c | |
parent | 853b3fc8ee9a4e7f26f87334655a3f5c772502b7 (diff) | |
parent | b395c3c85251d4e8761704d8e3a3c9f9fa5b45cc (diff) | |
download | vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.gz vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.bz2 vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
Diffstat (limited to 'fontconfig/src/fccfg.c')
-rw-r--r-- | fontconfig/src/fccfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index 45b486945..f94f0e051 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -398,7 +398,7 @@ FcConfigSetCurrent (FcConfig *config) if (config == _fcConfig) return FcTrue; - if (!config->fonts) + if (!config->fonts[FcSetSystem]) if (!FcConfigBuildFonts (config)) return FcFalse; |