diff --git a/resources/binaries b/resources/binaries index 572da127b..2305d0038 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07 +Subproject commit 2305d003830b54d1705a3bc49d3493ec96c59b2d diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index f253b954a..0d6fe49c5 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -63,8 +63,8 @@ DVALUE(bool) Messages::KeepCursorInCenterDef = false; DKEY Messages::RemoveDuplicates = "remove_duplicates"; DVALUE(bool) Messages::RemoveDuplicatesDef = false; -DKEY Messages::PreviewerFontStandard = "previewer_font_standard"; -DVALUE(QString) Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont); +DKEY Messages::PreviewerFontStandard = "previewer_font_standard"; +NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QString(); // GUI. DKEY GUI::ID = "gui"; @@ -282,6 +282,8 @@ DKEY Categories::ID = "categories_expand_states"; Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent) : QSettings(file_name, format, parent), m_initializationStatus(status) { + // Perform last-minute initializations. + Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont); } Settings::~Settings() { diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index b9fa1a983..ad3d2adbc 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -30,7 +30,9 @@ #define KEY extern const char* #define DKEY const char* #define VALUE(x) extern const x +#define NON_CONST_VALUE(x) extern x #define DVALUE(x) const x +#define NON_CONST_DVALUE(x) x #define SETTING(x) x, x##Def #define GROUP(x) x::ID @@ -74,7 +76,7 @@ namespace Messages { VALUE(bool) RemoveDuplicatesDef; KEY PreviewerFontStandard; - VALUE(QString) PreviewerFontStandardDef; + NON_CONST_VALUE(QString) PreviewerFontStandardDef; } // GUI.