diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-03-26 12:13:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-27 16:43:59 +0100 |
| commit | 3c3e2c324b9030570588b29f962a3e34bc48be1c (patch) | |
| tree | 3ddc0152e4c58ef8a745c151284d7cc818dad246 | |
| parent | 09e3d8a28e3e1d4903043f38553aed9d34bcde09 (diff) | |
Android: Don't call release() unless it's necessary.
If the mediaplayer is in either Idle or Uninitialized state, then there
is no need to call release again.
Change-Id: Idb6f2d9ea7aad7a9036e7e9a534c3bd296324068
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| -rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 4 |
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 f67808342..f5614a57a 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp @@ -289,7 +289,9 @@ void QAndroidMediaPlayerControl::setMedia(const QMediaContent &mediaContent, mMediaStream = stream; } - mMediaPlayer->release(); + // Release the mediaplayer if it's not in in Idle or Uninitialized state + if ((mState & (JMediaPlayer::Idle | JMediaPlayer::Uninitialized)) == 0) + mMediaPlayer->release(); if (mediaContent.isNull()) { setMediaStatus(QMediaPlayer::NoMedia); |