diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2017-01-26 15:40:30 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-01-26 15:53:44 +0100 |
| commit | c5ff5b853b9bca231c54ee07e5238714c0407595 (patch) | |
| tree | 0a4d842e7fcb6079d7c7b4935843eb1ba46a4422 /src/plugins/winrt/qwinrtmediaplayercontrol.cpp | |
| parent | 7e48870c182e66a8408bbcb4c9469d751a777daa (diff) | |
| parent | c1164f874a21959d03893f62db8f8e2def44122d (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/multimediawidgets/videographicsitem/videoplayer.h
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
Diffstat (limited to 'src/plugins/winrt/qwinrtmediaplayercontrol.cpp')
| -rw-r--r-- | src/plugins/winrt/qwinrtmediaplayercontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp index 5720488f2..a4df6306f 100644 --- a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp +++ b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp @@ -267,7 +267,8 @@ public: } if (d->videoRenderer) - d->videoRenderer->setActive(d->state == QMediaPlayer::PlayingState); + d->videoRenderer->setActive(d->state == QMediaPlayer::PlayingState && + d->videoRenderer->size().isValid()); const QMediaPlayer::MediaStatus oldMediaStatus = d->mediaStatus; const QMediaPlayer::State oldState = d->state; |