OSDN Git Service

fix registerFont() function regression since fb253d03c77d31fd4d56c93d8ee961c8d4ddb0c1
authorIvailo Monev <xakepa10@laimg.moc>
Sat, 21 Dec 2019 19:45:06 +0000 (19:45 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Sat, 21 Dec 2019 19:45:06 +0000 (19:45 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/gui/text/qfontdatabase_x11.h

index aa51fa1..586fba1 100644 (file)
@@ -1242,7 +1242,7 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
     QStringList families;
     QFontDatabasePrivate *db = privateDb();
 
-    while (id < count) {
+    do {
         FcPattern *pattern = queryFont((const FcChar8 *)QFile::encodeName(fnt->fileName).constData(),
                             fnt->data, id, blanks, &count);
         if (!pattern)
@@ -1273,7 +1273,7 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
             return;
 
         ++id;
-    }
+    } while (id < count);
 
     fnt->families = families;
 #endif