From: Patrick Lam <plam@MIT.EDU>
Date: Fri, 4 Nov 2005 16:48:32 +0000 (+0000)
Subject: Add test for validity of directory caches that somehow got lost (reported
X-Git-Tag: fc-2_3_92
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=50544b13c19c6a4a9fe9cf26cdd2170ddacf86d1;p=fontconfig.git

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
--- 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 3b9d23f..5452b60 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;
     }