diff --git a/src/ChangeLog b/src/ChangeLog
index c67bd19a295..a25f6cb615a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2008-05-26  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32font_text_extents): Zero whole metrics struct first.
+        (compute_metrics): Don't set failure if we just cleared the cache.
 
 2008-05-25  Kenichi Handa  <handa@m17n.org>
 
diff --git a/src/w32font.c b/src/w32font.c
index 22d8c26d069..64d48e2ed63 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1896,7 +1896,8 @@ static void compute_metrics (dc, w32_font, code, metrics)
 	  w32_font->glyph_idx = 0;
 	  clear_cached_metrics (w32_font);
 	}
-      metrics->status = W32METRIC_FAIL;
+      else
+        metrics->status = W32METRIC_FAIL;
     }
 }