summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Gehör <pekka.gehor@qt.io>2021-10-07 12:21:31 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-07 10:51:55 +0000
commiteb0e7668c6a660ec7645ee1a217a13e79f191cb7 (patch)
treecf1b0674751bebbabb1bc1302fd250891136e265
parent67146012af1cde71cb5fdd6640a6b0ec01c10d5d (diff)
downloadqtmultimedia-eb0e7668c6a660ec7645ee1a217a13e79f191cb7.tar.gz
Android: Fix the back button issues on qmlvideo example
After the fix, the app will no longer hang after back button has been clicked. Task-number: QTBUG-96947 Change-Id: Ia2adb7f493d66a3df0961793fd6bc5f998ad4764 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 5151712f9592e6855f6aeb79ac36f6ccd105fa82) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
index ed1d329f1..ae280d0bf 100644
--- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
@@ -100,6 +100,7 @@ QAndroidMediaPlayer::QAndroidMediaPlayer(QMediaPlayer *parent)
QAndroidMediaPlayer::~QAndroidMediaPlayer()
{
+ mMediaPlayer->disconnect();
mMediaPlayer->release();
delete mMediaPlayer;
}