Fix thinko: actually, the whole global cache is stale if the global cache

    is older than the (newest) config file.

diff --git a/ChangeLog b/ChangeLog
index 446d53f803e8fa7748741f9b244145f214e50f43..fdd56eeb14456d942fbd3bff1986aaa8ba07a153 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-02  Patrick Lam  <plam@mit.edu>
+       * src/fccache.c (FcGlobalCacheLoad):
+
+       Fix thinko: actually, the whole global cache is stale 
+       if the global cache is older than the (newest) config file.
+
 2005-11-02  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcGlobalCacheLoad):
        * src/fccfg.c (FcConfigModifiedTime, FcConfigBuildFonts):

diff --git a/src/fccache.c b/src/fccache.c
index 970a614f5956c9b367aac15d37add7b2612946c7..69bb3853680c00d184b53f5e1de70f0864371ff9 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -193,11 +193,11 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
        if (!strlen(name_buf))
            break;
 
-       /* Directory must be older than the global cache file, and
-          also must be older than the config file. */
+       /* Directory must be older than the global cache file; also
+          cache must be newer than the config file. */
         if (stat ((char *) name_buf, &dir_stat) < 0 || 
             dir_stat.st_mtime > cache_stat.st_mtime ||
-           (config_time.set && dir_stat.st_mtime > config_time.time))
+           (config_time.set && cache_stat.st_mtime < config_time.time))
         {
             FcCache md;