From bc2c42d6c6a927688a17ca5060c25a4e5c709734 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Wed, 21 Jan 2015 14:09:08 +0100 Subject: [PATCH] Camera: update viewfinder settings on Loaded status. Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39 Reviewed-by: Andrew den Exter --- src/imports/multimedia/qdeclarativecameraviewfinder.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp index abb0b62..97d93ec 100644 --- a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp +++ b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp @@ -100,7 +100,9 @@ void QDeclarativeCameraViewfinder::_q_cameraStatusChanged(QCamera::Status status { // Settings values might change when the camera starts, for example if the settings are // undefined, if unsupported values were set or if the settings conflict with capture settings. - if (status == QCamera::ActiveStatus) { + // They might also change on LoadedStatus, for example reverting to values that were set by the + // user. + if (status == QCamera::ActiveStatus || status == QCamera::LoadedStatus) { QCameraViewfinderSettings oldSettings = m_settings; m_settings = m_camera->viewfinderSettings(); if (oldSettings.resolution() != m_settings.resolution()) -- 2.7.4