diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-12-17 14:45:33 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2022-01-03 09:00:04 +0100 |
commit | ce14b6c2d3463f73d2e266af2dd97b942f2af109 (patch) | |
tree | 4a31280329d313c2e631c71cf70172f7145e4952 /src/gui/text/qfontdatabase.cpp | |
parent | 68c4669ce49aad21beff0e8ef0122a86d53b12e2 (diff) |
Avoid crash on app startup if the default font family is empty
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ø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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; + } } |