┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Pescosta <[email protected]>2014-10-29 12:20:10 +0100
committerEmmanuel Pescosta <[email protected]>2014-10-29 12:20:10 +0100
commit76a7ab4bffe7af84b96caf65bf43b7ee96b4e0c8 (patch)
treeeb500d89da45929439b6194c7e95fb5c0eefe086
parent1f02d15f7ec13dd206698f88a92a9949cbfc3470 (diff)
parentb3e113c05ae55b36f2748952544076e92f0b5bc0 (diff)
Merge branch 'KDE/4.14'
-rw-r--r--src/panels/information/phononwidget.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 3d9909239..63f5aa3a5 100644
--- 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)