Merge branch 'KDE/4.14'

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 3d9909239c112d03ad9ade7d7ff1e80ebe2dd9ca..63f5aa3a591d241767e94cf051a4016e458905ee 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -165,6 +165,12 @@ void PhononWidget::stateChanged(Phonon::State newstate)
         m_stopButton->show();
         m_playButton->hide();
         break;
+    case Phonon::StoppedState:
+        if (m_videoPlayer) {
+            m_videoPlayer->hide();
+        }
+        emit hasVideoChanged(false);
+        // fall through
     default:
         m_stopButton->hide();
         m_playButton->show();
@@ -207,16 +213,7 @@ void PhononWidget::stop()
 {
     if (m_media) {
         m_media->stop();
-
-        m_stopButton->hide();
-        m_playButton->show();
     }
-
-    if (m_videoPlayer) {
-        m_videoPlayer->hide();
-    }
-
-    emit hasVideoChanged(false);
 }
 
 void PhononWidget::slotHasVideoChanged(bool hasVideo)