qt-4.5 fixes

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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 23ce0b0c7..ad4bc9cef 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -134,12 +134,12 @@ void PlayListItem::readMetadata()
     m_title = printTag(m_title, "%f", url().section('/',-1));
     m_title = printTag(m_title, "%F", url());
     m_title = printTag(m_title, "%y", QString("%1").arg(year ()));
-
+    //TODO rewrite this
     if (m_title.isEmpty())
     {
         if (url().startsWith("http://")  && m_fullStreamPath)
             m_title = url();
-        else
+        else if (url().contains('/'))
             m_title = url().split('/',QString::SkipEmptyParts).takeLast ();
     }
     if (m_info)
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 29dbcb7b0..d02490f49 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -258,7 +258,7 @@ void MainWindow::showMetaData()
     qDebug("TRACK = %s", qPrintable(m_core->metaData(Qmmp::TRACK)));
     qDebug("== end of metadata ==");
 
-    if (m_playlist->currentItem())
+    if (m_playlist->currentItem() && !m_core->metaData().isEmpty())
     {
         m_playlist->currentItem()->updateMetaData(m_core->metaData());
         m_playlist->updateList();