[pango/redo-attrs: 9/13] Fix up non-user font shaping

[Matthias Clasen <matthiasc src gnome org>]

commit 2f1c1f033eb81eb8a5d864f744d9ec95e66df991
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jan 30 04:52:28 2022 +0100

    Fix up non-user font shaping

 pango/shape.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/pango/shape.c b/pango/shape.c
index 1a03ec1e..68d11eee 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -638,14 +638,14 @@ pango_shape_internal (const char          *item_text,
   g_return_if_fail (paragraph_text <= item_text);
   g_return_if_fail (paragraph_text + paragraph_length >= item_text + item_length);
 
-  if (PANGO_IS_HB_FONT (analysis->font))
+  if (PANGO_IS_USER_FONT (analysis->font))
+    pango_user_shape (item_text, item_length, analysis, glyphs, flags);
+  else if (analysis->font)
     pango_hb_shape (item_text, item_length,
                     paragraph_text, paragraph_length,
                     analysis,
                     log_attrs, num_chars,
                     glyphs, flags);
-  else if (PANGO_IS_USER_FONT (analysis->font))
-    pango_user_shape (item_text, item_length, analysis, glyphs, flags);
   else
     glyphs->num_glyphs = 0;