summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-05-18 14:44:23 +0200
committerLars Knoll <lars.knoll@qt.io>2021-05-19 18:11:24 +0000
commit743fb1e2a85fc2b0f9de09c100f2188ce53b1178 (patch)
tree945197c54a5f592a0a0dfc7b3edb875c8409ba36
parent520850e77332f6a341b40ad954de98c86c9f34b9 (diff)
Fix compilation on Android
Change-Id: I77117c75b718ce46ac76f9b4fc77d059e3c33954 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
-rw-r--r--src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp
index 90fbd0ac2..eb620a0d9 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp
@@ -97,12 +97,12 @@ void QAndroidMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *sessi
if (m_service)
setState(QMediaEncoder::StoppedState);
+ if (m_session)
+ m_session->setMediaEncoder(nullptr);
m_service = captureSession;
- if (!m_service) {
- disconnect(m_session, nullptr, this, nullptr);
+ if (!m_service)
return;
- }
m_session = m_service->captureSession();
Q_ASSERT(m_session);
m_session->setMediaEncoder(this);