diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:02:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:02:39 +0200 |
| commit | ec597d89320dd312382457a711ebddb085b16a59 (patch) | |
| tree | cd0a806dd7239ebadaa111ad817b4f7884a11e3c /src | |
| parent | 6dda96f4d4681f7107931bea4c5a0f3fc35bec8d (diff) | |
| parent | b799d36a9e543bccd921399e929ef7ad17f15497 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I34d2aa9cb4a9105d5de1a3634d8282dc68ceefe1
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp index 1c6497eb0..9631a6ba7 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp @@ -379,8 +379,6 @@ void QAndroidMediaPlayerControl::play() setMedia(mMediaContent, mMediaStream); } - setState(QMediaPlayer::PlayingState); - if ((mState & (AndroidMediaPlayer::Prepared | AndroidMediaPlayer::Started | AndroidMediaPlayer::Paused @@ -389,6 +387,7 @@ void QAndroidMediaPlayerControl::play() return; } + setState(QMediaPlayer::PlayingState); mMediaPlayer->play(); } |