From 3c3e2c324b9030570588b29f962a3e34bc48be1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Wed, 26 Mar 2014 12:13:49 +0100 Subject: 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 --- src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- cgit v1.2.1