diff options
author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-04-12 09:37:38 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-05-14 07:00:58 +0000 |
commit | 1cc12b8cdda2f9a0477be987824540af84deeb53 (patch) | |
tree | c52d3721393d10990d7e78b2796d382b41c0d913 | |
parent | 333aecfd4190b067f29332d3a5087530d92d59b3 (diff) | |
download | qtmultimedia-1cc12b8cdda2f9a0477be987824540af84deeb53.tar.gz |
DirectShow: Don't set the same media
Fixes tst_QMediaPlayerBackend::playlistObject()
Actual (currentMediaSpy.count()): 2
Expected (1) : 1
.\tst_qmediaplayerbackend.cpp(1224) : failure location
Task-number: QTBUG-65574
Change-Id: Ia7cbcb4a22ee43df9e1efff065910b084bdbf00e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
-rw-r--r-- | src/plugins/directshow/player/directshowplayercontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/directshow/player/directshowplayercontrol.cpp b/src/plugins/directshow/player/directshowplayercontrol.cpp index 2d0ee2d59..7de0a686f 100644 --- a/src/plugins/directshow/player/directshowplayercontrol.cpp +++ b/src/plugins/directshow/player/directshowplayercontrol.cpp @@ -219,6 +219,9 @@ const QIODevice *DirectShowPlayerControl::mediaStream() const void DirectShowPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream) { + if (m_media == media) + return; + m_pendingPosition = -1; m_emitPosition = -1; |