From cc8ac2a10360027b334db8e4b237207540004ae7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Mar 2021 21:05:42 +0000 Subject: Revert "Merge branch 'fix-deadlocks' into 'master'" This reverts merge request !309 --- pango/pangofc-fontmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pango/pangofc-fontmap.c') diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 7966a8cd..813b6c78 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1372,6 +1372,7 @@ start_init_in_thread (PangoFcFontMap *fcfontmap) GTask *task; fc_initialized = 1; + task = g_task_new (fcfontmap, NULL, NULL, NULL); g_task_set_name (task, "[pango] FcInit"); g_task_run_in_thread (task, init_in_thread); @@ -2332,7 +2333,7 @@ pango_fc_font_map_set_config (PangoFcFontMap *fcfontmap, FcConfigDestroy (oldconfig); /* No need to wait anymore */ - fc_initialized = 2; + fc_initialized = TRUE; } /** -- cgit v1.2.1