Don't try to change the resolution while we are changing the device.

[harmattan/cameraplus] / qml / MainPage.qml

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index c4f5de4..d45fac0 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -99,15 +99,21 @@ CameraPage {
         }
 
         onImageAspectRatioChanged: {
-            imageSettings.setImageResolution()
+            if (!root.deviceChangeInProgress) {
+                imageSettings.setImageResolution()
+            }
         }
 
         onImageResolutionChanged: {
-            imageSettings.setImageResolution()
+            if (!root.deviceChangeInProgress) {
+                imageSettings.setImageResolution()
+            }
         }
 
         onVideoResolutionChanged: {
-            videoSettings.setVideoResolution()
+            if (!root.deviceChangeInProgress) {
+                videoSettings.setVideoResolution()
+            }
         }
     }