diff --git a/shared/cairo-util.c b/shared/cairo-util.c index b210e93f0..6bce0d150 100644 --- a/shared/cairo-util.c +++ b/shared/cairo-util.c @@ -694,7 +694,9 @@ cleanup_after_cairo(void) /* some clients, particular weston-editor, still creates indirectly a * new font map; this makes sure we untie that up and avoid an assert * from cairo */ +#ifdef HAVE_PANGO pango_cairo_font_map_set_default(NULL); +#endif cairo_debug_reset_static_data(); #ifdef HAVE_PANGO FcFini();