[Fix] External font loading problem with text cursor accessing unacce…

…ssible textbase
Jojo-Schmitz · Sep 12, 2024 · 78c2a4a · 78c2a4a
1 parent 7e59be7
commit 78c2a4a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/libmscore/mscore.cpp b/libmscore/mscore.cpp
@@ -386,6 +386,7 @@ void MScore::init()
             ":/fonts/finalebroadway/FinaleBroadwayText.otf",
             };
 
+      // Include internal fonts into QFontDatabase
       for (unsigned i = 0; i < sizeof(fonts)/sizeof(*fonts); ++i) {
             QString str(fonts[i]);
             if (-1 == QFontDatabase::addApplicationFont(str)) {

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -6429,11 +6429,6 @@ void ScoreFont::draw(SymId id, QPainter* painter, const QSizeF& mag, const QPoin
 
       if (MScore::pdfPrinting) {
             if (font == 0) {
-                  QString s(_fontPath+_filename);
-                  if (-1 == QFontDatabase::addApplicationFont(s)) {
-                        qDebug("Mscore: fatal error: cannot load internal font <%s>", qPrintable(s));
-                        return;
-                        }
                   font = new QFont;
                   font->setWeight(QFont::Normal);
                   font->setItalic(false);
@@ -6562,7 +6557,7 @@ const char* Sym::id2name(SymId id)
 //    load default score font
 //---------------------------------------------------------
 
-void ScoreFont::initScoreFonts()
+void Ms::ScoreFont::initScoreFonts()
       {
       QJsonObject glyphNamesJson(ScoreFont::initGlyphNamesJson());
       if (glyphNamesJson.empty())
@@ -6675,6 +6670,17 @@ void ScoreFont::scanUserFonts(const QString& path, bool system)
 
       _allScoreFonts = _builtinScoreFonts;
       _allScoreFonts << _userScoreFonts << _systemScoreFonts;
+
+      // Include external fonts into QFontDatabase
+      for (auto& usrFont : _userScoreFonts) {
+            QString s(usrFont._fontPath + usrFont._filename);
+            if (-1 == QFontDatabase::addApplicationFont(s)) {
+                  if (!MScore::testMode)
+                        qDebug("Mscore: fatal error: cannot load external font <%s>", qPrintable(s));
+                  if (!MScore::debugMode && !MScore::testMode)
+                        exit(-1);
+                  }
+            }
       }
 
 //---------------------------------------------------------