From 21d50e2163038c8acc0eef738acf61f851835f7d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 28 Jul 2009 13:24:43 +0100
Subject: [PATCH] [gl] Unthaw font along contended path.

If we bail after freezing the font, make sure we thaw that it is thawed
before returning.
---
 src/cairo-gl-glyphs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
index 0aa9b4101..c550e3493 100644
--- a/src/cairo-gl-glyphs.c
+++ b/src/cairo-gl-glyphs.c
@@ -460,7 +460,7 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
 
     _cairo_scaled_font_freeze_cache (scaled_font);
     if (! _cairo_gl_surface_owns_font (dst, scaled_font))
-	goto CLEANUP_CONTEXT;
+	goto CLEANUP_FONT;
 
     if (scaled_font->surface_private == NULL) {
 	/* XXX couple into list to remove on context destruction */
@@ -570,9 +570,9 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
     status = CAIRO_STATUS_SUCCESS;
   FINISH:
     _cairo_gl_flush_glyphs (ctx, &setup);
+  CLEANUP_FONT:
     _cairo_scaled_font_thaw_cache (scaled_font);
 
-  CLEANUP_CONTEXT:
     glDisable (GL_BLEND);
     glDisable (GL_SCISSOR_TEST);