main.cpp   main.cpp 
skipping to change at line 313 skipping to change at line 313
// This is useful for distribution having already a package for DejaVu font. // This is useful for distribution having already a package for DejaVu font.
// qWarning() << "ERROR while loading font DejaVuSans : " << e.what(); // qWarning() << "ERROR while loading font DejaVuSans : " << e.what();
} }
QString fileFont = confSettings->value("gui/base_font_file", "").toS tring(); QString fileFont = confSettings->value("gui/base_font_file", "").toS tring();
if (!fileFont.isEmpty()) if (!fileFont.isEmpty())
{ {
try try
{ {
const QString& afName = StelFileMgr::findFile(QStrin g("data/%1").arg(fileFont)); const QString& afName = StelFileMgr::findFile(QStrin g("data/%1").arg(fileFont));
if (!afName.isEmpty()) if (!afName.isEmpty() && !afName.contains("file not found"))
QFontDatabase::addApplicationFont(afName); QFontDatabase::addApplicationFont(afName);
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << "ERROR while loading custom font " << fileFont << " : " << e.what(); qWarning() << "ERROR while loading custom font " << fileFont << " : " << e.what();
} }
} }
QString baseFont = confSettings->value("gui/base_font_name", "DejaVu Sans").toString(); QString baseFont = confSettings->value("gui/base_font_name", "DejaVu Sans").toString();
QString safeFont = confSettings->value("gui/safe_font_name", "Verdan a").toString(); QString safeFont = confSettings->value("gui/safe_font_name", "Verdan a").toString();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/