[cairo-commit] cairo/src cairo-font.c,1.71,1.72

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv21988/src

Modified Files:
	cairo-font.c 
Log Message:

2005-08-19  Carl Worth  <cworth at cworth.org>

        * src/cairo-font.c: (_cairo_scaled_font_set_error): Fix to
        actually test scaled_font->status instead of just having a comment
        that claims to test it. Thanks to Behdad Esfahbod
        <behdad at cs.toronto.edu>.


Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cairo-font.c	19 Aug 2005 19:08:42 -0000	1.71
+++ cairo-font.c	19 Aug 2005 20:00:23 -0000	1.72
@@ -447,7 +447,8 @@
     /* Don't overwrite an existing error. This preserves the first
      * error, which is the most significant. It also avoids attempting
      * to write to read-only data (eg. from a nil scaled_font). */
-    scaled_font->status = status;
+    if (scaled_font->status == CAIRO_STATUS_SUCCESS)
+	scaled_font->status = status;
 
     _cairo_error (status);
 }