diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-06-24 23:03:39 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-06-24 23:03:39 -0400 |
| commit | 643b70644aabdbebd6bdfe7a5f128efde39caced (patch) | |
| tree | 8e70a57f1ce49fd6d6692a2dabe178d7fbabb8fe | |
| parent | f868f085dd22f74ea43426d21b13165ebcd091b4 (diff) | |
| download | pango-643b70644aabdbebd6bdfe7a5f128efde39caced.tar.gz | |
Bug 586814 – Crashes related to fontmap destruction after upgrade
Followup patch from Morten.
| -rw-r--r-- | pango/pangofc-font.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index e5df33d2..509d0987 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -140,7 +140,11 @@ pango_fc_font_finalize (GObject *object) g_slist_free (fcfont->metrics_by_lang); if (fcfont->fontmap) - _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont); + { + _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont); + g_object_remove_weak_pointer (G_OBJECT (fcfont->fontmap), (gpointer *) (gpointer) &fcfont->fontmap); + fcfont->fontmap = NULL; + } FcPatternDestroy (fcfont->font_pattern); pango_font_description_free (fcfont->description); |