Normalize font dirs by using the form, as given in fonts.conf, and recorded

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 5452b60ca6f91daf2c6da51610faac751e7fbb29..cf4a25be363ae305e2e378365e17c259b49ea0d5 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -139,7 +139,7 @@ FcDirScanConfig (FcFontSet  *set,
        if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
            return FcTrue;
 
-       if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir))
+       if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir, config))
            return FcTrue;
     }
     
@@ -165,6 +165,7 @@ FcDirScanConfig (FcFontSet  *set,
        return FcFalse;
     }
 
+    FcConfigAddFontDir (config, dir);
     tmpSet = FcFontSetCreate();
     if (!tmpSet)
     {