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

    by make distcheck).

diff --git a/ChangeLog b/ChangeLog
index d067f45..2d26433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 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:
        * configure.in:

diff --git a/src/fcdir.c b/src/fcdir.c
index 3b9d23f..5452b60 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;
     }