don't access the old (invalid) face pointer after loading a fallback face

2002-07-22  Sven Neumann  <sven@gimp.org>

	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
	(invalid) face pointer after loading a fallback face because we
	couldn't set the unicode charmap.

7 files changed, 39 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 687c05ac..6a68b7d1 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+2002-07-22  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
+	(invalid) face pointer after loading a fallback face because we
+	couldn't set the unicode charmap.
+
 2002-07-16  jacob berkman  <jacob@ximian.com>
 
 	* configure.in: use $X_CFLAGS when looking for Xft headers
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 051d0012..c667b4ae 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -230,9 +230,7 @@ pango_ft2_font_get_face (PangoFont      *font)
 
   g_assert (ft2font->face);
   
-  face = ft2font->face;
-
-  if (!set_unicode_charmap (face))
+  if (!set_unicode_charmap (ft2font->face))
     {
       g_warning ("Unable to load unicode charmap from font file %s", filename);
       
@@ -242,6 +240,8 @@ pango_ft2_font_get_face (PangoFont      *font)
       load_fallback_face (ft2font, filename);
     }
 
+  face = ft2font->face;
+
   if (ft2font->size != GPOINTER_TO_UINT (face->generic.data))
     {
       face->generic.data = GUINT_TO_POINTER (ft2font->size);