diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/configdialog.cpp | 2 | ||||
| -rw-r--r-- | src/ui/textscroller.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 8b2d60d7d..256e70cdb 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -394,10 +394,10 @@ void ConfigDialog::loadFonts() ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.plFontLabel->setFont(font); + font = QApplication::font (); fontname = settings.value ("MainWindow/Font").toString(); if(!fontname.isEmpty()) font.fromString(fontname); - font.fromString(fontname); ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); } diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 26330acd8..577403ba7 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -124,8 +124,9 @@ void TextScroller::setAutoscroll(bool enabled) void TextScroller::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QString fontname = settings.value("MainWindow/Font","").toString(); - m_font.fromString(fontname); + QString fontname = settings.value("MainWindow/Font").toString(); + if(!fontname.isEmpty()) + m_font.fromString(fontname); if (m_update) { |