diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 20:39:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 20:39:20 +0000 |
| commit | 1fedc11aa03d95e4e365f01796ecceca8b0acd0e (patch) | |
| tree | ef449695d79e349dd05de8e6330dc4d291f5816f /pango/pangofc-fontmap.c | |
| parent | 379f38e0054e72b003f1d81a48b83fef7ffb5312 (diff) | |
| parent | 3aab7d85577d1aff46d7c7f131622cb73e9fe66a (diff) | |
| download | pango-1fedc11aa03d95e4e365f01796ecceca8b0acd0e.tar.gz | |
Merge branch 'fix-deadlocks' into 'master'
Fix deadlocks
See merge request GNOME/pango!310
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 813b6c78..7966a8cd 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1372,7 +1372,6 @@ 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); @@ -2333,7 +2332,7 @@ pango_fc_font_map_set_config (PangoFcFontMap *fcfontmap, FcConfigDestroy (oldconfig); /* No need to wait anymore */ - fc_initialized = TRUE; + fc_initialized = 2; } /** |