fixed text scroller regression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2108 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 4 insertions, 10 deletions

diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp
index d541231ad..1fac2a753 100644
--- a/src/ui/textscroller.cpp
+++ b/src/ui/textscroller.cpp
@@ -56,7 +56,8 @@ TextScroller::TextScroller (QWidget *parent)
     connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(processState(Qmmp::State)));
     connect(m_core, SIGNAL(metaDataChanged()), SLOT(processMetaData()));
-    readSettings();
+    //readSettings();
+    updateSkin();
 }
 
 TextScroller::~TextScroller()
@@ -101,20 +102,14 @@ void TextScroller::updateSkin()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_bitmap = settings.value("MainWindow/bitmap_font", false).toBool();
     m_ratio = m_skin->ratio();
-    updateText();
-}
-
-void TextScroller::readSettings()
-{
-    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    QString fontname = settings.value("MainWindow/Font","").toString();
+    QString fontname = settings.value("MainWindow/Font").toString();
     m_font.fromString(fontname);
     if (m_metrics)
         delete m_metrics;
     else
         m_scrollAction->setChecked(settings.value("TextScroller/autoscroll", true).toBool());
     m_metrics = new QFontMetrics(m_font);
-    updateSkin();
+    updateText();
 }
 
 void TextScroller::setProgress(int progress)
diff --git a/src/ui/textscroller.h b/src/ui/textscroller.h
index 7367ad2b1..3fe50bf7e 100644
--- a/src/ui/textscroller.h
+++ b/src/ui/textscroller.h
@@ -59,7 +59,6 @@ private:
     void mousePressEvent(QMouseEvent *);
     void mouseReleaseEvent(QMouseEvent *);
     void mouseMoveEvent(QMouseEvent *);
-    void readSettings();
     void preparePixmap(const QString &text, bool scrollable = false);
     QString m_defautText;
     QString m_bufferText;