diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
| commit | 80dbd6ea6f37793109b0ab5bfd43bac811810481 (patch) | |
| tree | cefb099aba71c769dca55b54d5b87a54faf8db6b /pango/pangofc-fontmap.c | |
| parent | 1fedc11aa03d95e4e365f01796ecceca8b0acd0e (diff) | |
| parent | cc8ac2a10360027b334db8e4b237207540004ae7 (diff) | |
| download | pango-80dbd6ea6f37793109b0ab5bfd43bac811810481.tar.gz | |
Merge branch 'revert-1fedc11a' into 'master'
Revert "Merge branch 'fix-deadlocks' into 'master'"
See merge request GNOME/pango!311
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } /** |