diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
| commit | a06ee3399bece608790e419054f95807a017a020 (patch) | |
| tree | 9caa2fd08b4c83e1ff2bad7cd51dfba6a60d2a7c /src/panels/information/phononwidget.cpp | |
| parent | 7745a9354776c6043b4f691260e434c29de6ca0c (diff) | |
| parent | cf6bb7bdb8df6f484a39403c7842343bceebf4b7 (diff) | |
Merge branch 'Applications/14.12' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
konqueror/settings/ebrowsing/ebrowsing.desktop
konqueror/settings/kio/cache.desktop
konqueror/settings/kio/cookies.desktop
konqueror/settings/kio/netpref.desktop
konqueror/settings/kio/proxy.desktop
konqueror/settings/kio/smb.desktop
konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
konqueror/settings/kio/useragent.desktop
lib/konq/konq_operations.cpp
Diffstat (limited to 'src/panels/information/phononwidget.cpp')
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 1c9c21cd3..215be200a 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -166,6 +166,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(); @@ -208,16 +214,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) |