diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
| commit | 49461f9cffa5439e536a844ec3a0134c252141e6 (patch) | |
| tree | 3d645b3c8fe5d9b374c6df8e12705ee090596d42 /src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | |
| parent | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (diff) | |
| parent | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm index e1adf44b1..19bc8815c 100644 --- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm +++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm @@ -345,7 +345,7 @@ QList<QCameraViewfinderSettings> AVFCameraViewfinderSettingsControl2::supportedV QCameraViewfinderSettings AVFCameraViewfinderSettingsControl2::viewfinderSettings() const { - QCameraViewfinderSettings settings; + QCameraViewfinderSettings settings = m_settings; AVCaptureDevice *captureDevice = m_service->session()->videoCaptureDevice(); if (!captureDevice) { @@ -353,6 +353,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) { |