Merge pull request #26912 from Eism/ui_font_atempt_to_fix_4.5

Attempt to fix #24456: UI font sometimes gets replaced by a symbol font on update

Author: Eism

src/framework/ui/internal/uiconfiguration.cpp

@@ -107,6 +107,8 @@ void UiConfiguration::init()
         m_windowGeometryChanged.notify();
     });
 
+    correctUserFontIfNeeded();
+
     initThemes();
 }
 
@@ -138,6 +140,17 @@ void UiConfiguration::initThemes()
     updateCurrentTheme();
 }
 
+void UiConfiguration::correctUserFontIfNeeded()
+{
+    QString userFontFamily = QString::fromStdString(fontFamily());
+    if (!QFontDatabase::hasFamily(userFontFamily)) {
+        std::string fallbackFontFamily = defaultFontFamily();
+        LOGI() << "The user font " << userFontFamily << " is missing, we will use the fallback font " << fallbackFontFamily;
+
+        setFontFamily(fallbackFontFamily);
+    }
+}
+
 void UiConfiguration::updateCurrentTheme()
 {
     ThemeCode currentCodeKey = currentThemeCodeKey();

src/framework/ui/internal/uiconfiguration.h

@@ -121,7 +121,10 @@ class UiConfiguration : public IUiConfiguration, public Injectable, public async
 
 private:
     void initThemes();
+    void correctUserFontIfNeeded();
+
     void notifyAboutCurrentThemeChanged();
+
     void updateCurrentTheme();
     void updateThemes();