summaryrefslogtreecommitdiff
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@qt.io>2016-08-01 11:52:05 +0200
committerYoann Lopes <yoann.lopes@qt.io>2016-08-01 11:52:05 +0200
commit339944b284e9dd11302dd013f9d9a10ad0d9055a (patch)
treec2952d186b1dbc6f2380448fa2cfd9ec55043da6 /src/plugins/qnx
parent53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff)
parentd7d31d63db5f0029a4a5e24d998601baee8bade0 (diff)
downloadqtmultimedia-339944b284e9dd11302dd013f9d9a10ad0d9055a.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r--src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
index 87c2c26dc..5cd3bc3d2 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -346,6 +346,8 @@ void MmRendererMediaPlayerControl::setState(QMediaPlayer::State state)
void MmRendererMediaPlayerControl::stopInternal(StopCommand stopCommand)
{
+ setPosition(0);
+
if (m_state != QMediaPlayer::StoppedState) {
if (stopCommand == StopMmRenderer) {
@@ -355,11 +357,6 @@ void MmRendererMediaPlayerControl::stopInternal(StopCommand stopCommand)
setState(QMediaPlayer::StoppedState);
}
-
- if (m_position != 0) {
- m_position = 0;
- emit positionChanged(0);
- }
}
void MmRendererMediaPlayerControl::setVolume(int volume)