From c8090b79520bd7834954a743d64c0c5eecf01c23 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Fri, 11 Mar 2016 15:34:13 +0100
Subject: AVFoundation: return correct viewfinder settings.

When the camera is unloaded, return the requested settings.

Change-Id: If39e158cd8d0fd8d4bbd7cf6cd48226cdefc1272
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
---
 .../avfoundation/camera/avfcameraviewfindersettingscontrol.mm      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm')

diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
index 3c20801e5..472e84ed1 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
@@ -339,7 +339,7 @@ QList<QCameraViewfinderSettings> AVFCameraViewfinderSettingsControl2::supportedV
 
 QCameraViewfinderSettings AVFCameraViewfinderSettingsControl2::viewfinderSettings() const
 {
-    QCameraViewfinderSettings settings;
+    QCameraViewfinderSettings settings = m_settings;
 
     AVCaptureDevice *captureDevice = m_service->session()->videoCaptureDevice();
     if (!captureDevice) {
@@ -347,6 +347,11 @@ QCameraViewfinderSettings AVFCameraViewfinderSettingsControl2::viewfinderSetting
         return settings;
     }
 
+    if (m_service->session()->state() != QCamera::LoadedState &&
+        m_service->session()->state() != QCamera::ActiveState) {
+        return settings;
+    }
+
 #if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_7, __IPHONE_7_0)
     if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_7, QSysInfo::MV_IOS_7_0)) {
         if (!captureDevice.activeFormat) {
-- 
cgit v1.2.3