From c54bd1327085d9e1d8a9ff3236aa805842545a3e Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Sun, 18 Aug 2013 00:09:24 +0300 Subject: [PATCH] resetCamera() will set needed resolution after resetting camera. No need to do that when either ImageSettings or VideoSettings become ready --- qml/MainPage.qml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/qml/MainPage.qml b/qml/MainPage.qml index fb13033..c4f5de4 100644 --- a/qml/MainPage.qml +++ b/qml/MainPage.qml @@ -123,6 +123,13 @@ CameraPage { return false } + if (mode == Camera.ImageMode) { + imageSettings.setImageResolution() + } + else if (mode == Camera.VideoMode) { + videoSettings.setVideoResolution() + } + return true } @@ -220,12 +227,6 @@ CameraPage { showError(qsTr("Failed to set required resolution")) } } - - onReadyChanged: { - if (ready) { - imageSettings.setImageResolution() - } - } } VideoSettings { @@ -237,12 +238,6 @@ CameraPage { showError(qsTr("Failed to set required resolution")) } } - - onReadyChanged: { - if (ready) { - videoSettings.setVideoResolution() - } - } } ModeController { -- 2.25.1