4 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index f2ed0d793..f7646d0a4 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -123,7 +123,7 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
         fileName = metaData[Qmmp::URL].section("/", 1);
 
     MetaDataFormatter formatter(fileName);
-    fileName = formatter.format(metaData, SoundCore::instance()->duration() / 1000);
+    fileName = formatter.format(metaData, SoundCore::instance()->duration());
     if(!fileName.endsWith(".ogg", Qt::CaseInsensitive))
         fileName.append(".ogg");
 
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 21f1a6519..86a260324 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -136,7 +136,7 @@ void StatusIcon::showMetaData()
         }
     }
 
-    QString message = m_messageFormatter.format(meta, m_core->duration() / 1000);
+    QString message = m_messageFormatter.format(meta, m_core->duration());
     if (message.isEmpty())
         message = meta[Qmmp::URL].section('/',-1);
 
@@ -146,7 +146,7 @@ void StatusIcon::showMetaData()
 
     if(m_showToolTip)
     {
-        message = m_toolTipFormatter.format(meta, m_core->duration() / 1000);
+        message = m_toolTipFormatter.format(meta, m_core->duration());
         if(message.isEmpty())
             message = meta[Qmmp::URL].section('/',-1);
         m_tray->setToolTip(message);
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 3f9d3d1bd..ffd69ad2e 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -253,7 +253,7 @@ void TextScroller::processMetaData()
 {
     if(m_core->state() == Qmmp::Playing)
     {
-        m_titleText = m_formater.format(m_core->metaData(), m_core->duration()/1000);
+        m_titleText = m_formater.format(m_core->metaData(), m_core->duration());
         updateText();
     }
 }
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index 181e07435..716af2528 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -162,6 +162,7 @@ void StateHandler::dispatch(Qmmp::State state)
         m_elapsed = -1;
         m_bitrate = 0;
         m_info.clear();
+        m_metaData.clear();
         m_streamInfo.clear();
         m_audioParameters = AudioParameters();
         m_sendAboutToFinish = true;