From: Mohammed Sameer <msameer@foolab.org>
Date: Fri, 2 Aug 2013 21:38:51 +0000 (+0300)
Subject: Reset pipeline manager error and try to start camera device when device gets changed
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=3a0a63499a4a2f1b19e5f444fcab2d9a26640b1d;p=harmattan%2Fcameraplus

Reset pipeline manager error and try to start camera device when device gets changed
---

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 997ce6e..0f5c517 100644
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -80,7 +80,14 @@ CameraPage {
 
     Settings {
         id: settings
-        onDeviceChanged: root.resetCamera(settings.device, settings.mode)
+        onDeviceChanged: {
+            // Reset pipeline manager error
+            pipelineManager.error = false
+
+            if (root.resetCamera(settings.device, settings.mode)) {
+                pipelineManager.startCamera()
+            }
+        }
     }
 
     PipelineManager {
@@ -92,7 +99,10 @@ CameraPage {
     function resetCamera(deviceId, mode) {
         if (!viewfinder.camera.reset(deviceId, mode)) {
             showError(qsTr("Failed to set camera device and mode. Please restart the application."))
+            return false
         }
+
+        return true
     }
 
     function showError(msg) {