From b690a4d90282d2cae5d7a10739d726594d036dde Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 21 Jan 2014 16:23:41 +0100 Subject: [PATCH] Android: fix crash in QAndroidCaptureSession. Don't try to apply video recording settings until a camera is actually started. Change-Id: I5348b91669835b9d776f56a3f49e3f8a11533d15 Reviewed-by: Christian Stromme --- .../android/src/mediacapture/qandroidcapturesession.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp index 3962baba..f40ec249 100644 --- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp @@ -389,7 +389,7 @@ void QAndroidCaptureSession::applySettings() } // video settings - if (m_cameraSession && m_videoSettingsDirty) { + if (m_cameraSession && m_cameraSession->camera() && m_videoSettingsDirty) { if (m_videoSettings.resolution().isEmpty()) { m_videoSettings.setResolution(m_defaultSettings.videoResolution); m_resolutionDirty = true; @@ -466,6 +466,8 @@ void QAndroidCaptureSession::onCameraOpened() qSort(m_supportedResolutions.begin(), m_supportedResolutions.end(), qt_sizeLessThan); qSort(m_supportedFramerates.begin(), m_supportedFramerates.end()); + + applySettings(); } QAndroidCaptureSession::CaptureProfile QAndroidCaptureSession::getProfile(int id)