Index: cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.64
diff -u -r1.64 cairo_gstate.c
--- cairo/src/cairo_gstate.c	5 Nov 2004 18:57:50 -0000	1.64
+++ cairo/src/cairo_gstate.c	13 Nov 2004 23:04:16 -0000
@@ -2003,10 +2003,10 @@
     {
 	if (gstate->font != NULL)
 	    _cairo_unscaled_font_destroy (gstate->font);
-
-	cairo_matrix_set_identity (&gstate->font_matrix);
-	gstate->font = tmp;
     }
+
+    cairo_matrix_set_identity (&gstate->font_matrix);
+    gstate->font = tmp;
   
     return CAIRO_STATUS_SUCCESS;
 }