summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2018-09-21 15:43:12 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2018-09-24 06:56:13 +0000
commite8a82901e2456bd6112cb1298b795f202b80a36d (patch)
tree3d300e8aea62a7357897177090796316be28f58f
parent32708d53946da77b6137fa04b1849b27e84f2d0f (diff)
Android: Fix crash when play() is called but state is not set
Change state to PlayingState only when media content has been provided. Task-number: QTBUG-70653 Task-number: QTBUG-68998 Change-Id: Iad8fc2c964ff22e90de6eb9b84c82a0950d0b1ac Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
index 9631a6ba7..7aa7b97b8 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -379,6 +379,9 @@ void QAndroidMediaPlayerControl::play()
setMedia(mMediaContent, mMediaStream);
}
+ if (!mMediaContent.isNull())
+ setState(QMediaPlayer::PlayingState);
+
if ((mState & (AndroidMediaPlayer::Prepared
| AndroidMediaPlayer::Started
| AndroidMediaPlayer::Paused
@@ -387,7 +390,6 @@ void QAndroidMediaPlayerControl::play()
return;
}
- setState(QMediaPlayer::PlayingState);
mMediaPlayer->play();
}