From 743fb1e2a85fc2b0f9de09c100f2188ce53b1178 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 18 May 2021 14:44:23 +0200
Subject: Fix compilation on Android

Change-Id: I77117c75b718ce46ac76f9b4fc77d059e3c33954
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 .../platform/android/mediacapture/qandroidmediaencoder.cpp          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/multimedia')

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);
-- 
cgit v1.2.3