Camera: update viewfinder settings on Loaded status.

Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp
index abb0b62..97d93ec 100644 (file)
--- 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())