Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	src/multimedia/configure.json

Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb

1 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/directshow/player/directshowplayercontrol.cpp b/src/plugins/directshow/player/directshowplayercontrol.cpp
index 7e1413b56..2fe43f21b 100644
--- a/src/plugins/directshow/player/directshowplayercontrol.cpp
+++ b/src/plugins/directshow/player/directshowplayercontrol.cpp
@@ -89,9 +89,11 @@ void DirectShowPlayerControl::setPosition(qint64 position)
         emit mediaStatusChanged(m_status);
     }
 
-    if (m_state == QMediaPlayer::StoppedState && m_pendingPosition != position) {
-        m_pendingPosition = position;
-        emit positionChanged(m_pendingPosition);
+    if (m_state == QMediaPlayer::StoppedState) {
+        if (m_pendingPosition != position) {
+            m_pendingPosition = position;
+            emit positionChanged(m_pendingPosition);
+        }
         return;
     }
 
@@ -280,6 +282,9 @@ void DirectShowPlayerControl::emitPropertyChanges()
     int properties = m_updateProperties;
     m_updateProperties = 0;
 
+    if (properties & StatusProperty)
+        emit mediaStatusChanged(m_status);
+
     if ((properties & ErrorProperty) && m_error != QMediaPlayer::NoError)
         emit error(m_error, m_errorString);
 
@@ -300,9 +305,6 @@ void DirectShowPlayerControl::emitPropertyChanges()
     if (properties & SeekableProperty)
         emit seekableChanged(m_seekable);
 
-    if (properties & StatusProperty)
-        emit mediaStatusChanged(m_status);
-
     if (properties & StateProperty)
         emit stateChanged(m_state);
 }