From 643b70644aabdbebd6bdfe7a5f128efde39caced Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 24 Jun 2009 23:03:39 -0400 Subject: =?UTF-8?q?Bug=20586814=20=E2=80=93=20Crashes=20related=20to=20fon?= =?UTF-8?q?tmap=20destruction=20after=20upgrade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup patch from Morten. --- pango/pangofc-font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); -- cgit v1.2.1