Add test for validity of directory caches that somehow got lost (reported

    by make distcheck).

diff --git a/ChangeLog b/ChangeLog
index d067f4554f28d6c811f12f0e919558b5225b00f3..2d26433fea390841718ca98bd72436c3dfd31984 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-04  Patrick Lam  <plam@mit.edu>
+       * src/fcdir.c (FcDirScanConfig):
+
+       Add test for validity of directory caches that
+       somehow got lost (reported by make distcheck).
+
 2005-11-04  Patrick Lam  <plam@mit.edu>
        * ChangeLog:
        * README:

diff --git a/src/fcdir.c b/src/fcdir.c
index 3b9d23f51b458bf1727643f7ab157e2db893acb0..5452b60ca6f91daf2c6da51610faac751e7fbb29 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 (FcDirCacheRead (set, dirs, dir))
+       if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir))
            return FcTrue;
     }