Merge branch 'fontmap-thread-fix' into 'master'

fc: Fix an ordering issue

Closes #537

See merge request GNOME/pango!290

1 files changed, 7 insertions, 0 deletions

diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index aa90345e..fef3394a 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -800,6 +800,10 @@ static ThreadData *
 thread_data_new (PangoFcPatterns *patterns)
 {
   ThreadData *td;
+  PangoFcFontMap *fontmap = patterns->fontmap;
+
+  /* We don't want the fontmap dying on us */
+  g_object_ref (fontmap);
 
   td = g_new (ThreadData, 1);
   td->patterns = pango_fc_patterns_ref (patterns);
@@ -814,12 +818,15 @@ static void
 thread_data_free (gpointer data)
 {
   ThreadData *td = data;
+  PangoFcFontMap *fontmap = td->patterns->fontmap;
 
   g_clear_pointer (&td->fonts, FcFontSetDestroy);
   FcPatternDestroy (td->pattern);
   FcConfigDestroy (td->config);
   pango_fc_patterns_unref (td->patterns);
   g_free (td);
+
+  g_object_unref (fontmap);
 }
 
 static void