From 0cace3237df47e8e6e99316adf1b40811a413063 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 7 May 2019 10:52:15 -0400 Subject: [PATCH] Don't load custom fonts when using Chinese or Korean --- src/QGCApplication.cc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 6d0b9b81c..cde048a44 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -474,11 +474,17 @@ void QGCApplication::_initCommon() bool QGCApplication::_initForNormalAppBoot() { - if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) { - qWarning() << "Could not load /fonts/opensans font"; - } - if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) { - qWarning() << "Could not load /fonts/opensans-demibold font"; + + //-- See App.SettinsGroup.json for index + int langID = toolbox()->settingsManager()->appSettings()->language()->rawValue().toInt(); + //-- Don't load custom fonts if not using standard character set + if(langID != 6 /*Korean*/ && langID != 9 /*Chinese*/) { + if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) { + qWarning() << "Could not load /fonts/opensans font"; + } + if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) { + qWarning() << "Could not load /fonts/opensans-demibold font"; + } } QSettings settings; -- 2.22.0