From ce14b6c2d3463f73d2e266af2dd97b942f2af109 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 17 Dec 2021 14:45:33 +0100 Subject: Avoid crash on app startup if the default font family is empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't call first() on a potentially empty list of families. Fixes a crash on startup on QNX for me. Change-Id: I551d21dac8cfd104b774d6442bdbe1db35f8b75c Reviewed-by: Tor Arne Vestbø --- src/gui/text/qfontdatabase.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/gui/text/qfontdatabase.cpp') diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index e2898b078c..56930bfdc6 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -2535,9 +2535,12 @@ void QFontDatabasePrivate::load(const QFontPrivate *d, int script) family_list << req.families.at(0); // add the default family - QString defaultFamily = QGuiApplication::font().families().first(); - if (! family_list.contains(defaultFamily)) - family_list << defaultFamily; + auto families = QGuiApplication::font().families(); + if (!families.isEmpty()) { + QString defaultFamily = families.first(); + if (! family_list.contains(defaultFamily)) + family_list << defaultFamily; + } } -- cgit v1.2.3