fixed text scroller and window titles

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

2 files changed, 7 insertions, 6 deletions

diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp
index 8d2ce84ab..a3e9ad430 100644
--- a/src/ui/listwidget.cpp
+++ b/src/ui/listwidget.cpp
@@ -300,11 +300,6 @@ void ListWidget::updateList()
         m_titles.replace(i, title.prepend(QString("%1").arg(m_first+i+1)+". "));
 
     }
-    if (m_model->currentItem())
-    {
-        TextScroller::getPointer()->setText(m_model->currentItem()->text());
-        parentWidget()->parentWidget()->setWindowTitle(m_model->currentItem()->text());
-    }
     cut();
     update();
 }
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 4002f4fae..50c695d3c 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -249,6 +249,10 @@ void MainWindow::showState(Qmmp::State state)
         //m_generalHandler->setState(General::Stopped);
         m_playlist->setTime(-1);
         m_titlebar->setTime(-1);
+        if (m_playlist->currentItem())
+            setWindowTitle(m_playlist->currentItem()->text());
+        else
+            setWindowTitle("Qmmp");
         break;
     }
     }
@@ -269,6 +273,8 @@ void MainWindow::showMetaData()
     {
         m_playlist->currentItem()->updateMetaData(m_core->metaData());
         m_playlist->updateList();
+        TextScroller::getPointer()->setText(m_playlist->currentItem()->text());
+        setWindowTitle(m_playlist->currentItem()->text());
     }
 }