Add test for validity of directory caches that somehow got lost (reportedfc-2_3_92

    by make distcheck).

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d067f455..2d26433f 100644
--- 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 3b9d23f5..5452b60c 100644
--- 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;
     }