From 9546aadb83f80d8d2b7bfbdf95672d385ddf4416 Mon Sep 17 00:00:00 2001
From: Mohammed Sameer <msameer@foolab.org>
Date: Fri, 16 Aug 2013 02:36:48 +0300
Subject: [PATCH] Reset toolbar when device gets changed

---
 qml/CameraView.qml   |  6 ++++++
 qml/ImageOverlay.qml |  9 +++++++++
 qml/MainPage.qml     |  2 ++
 qml/VideoOverlay.qml | 13 ++++++++++---
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/qml/CameraView.qml b/qml/CameraView.qml
index c4463df..404db9e 100644
--- a/qml/CameraView.qml
+++ b/qml/CameraView.qml
@@ -283,4 +283,10 @@ Viewfinder {
 
         return false
     }
+
+    function cameraDeviceChanged() {
+        if (loader.item) {
+            loader.item.cameraDeviceChanged()
+        }
+    }
 }
diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index e8c88e3..77fb6b5 100644
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -294,4 +294,13 @@ Item {
         }
     }
 
+    function resetToolBar() {
+        if (toolBar.depth() > 1) {
+            toolBar.pop()
+        }
+    }
+
+    function cameraDeviceChanged() {
+        resetToolBar()
+    }
 }
diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index c870be0..863a58c 100644
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -81,6 +81,8 @@ CameraPage {
     Settings {
         id: settings
         onDeviceChanged: {
+            viewfinder.cameraDeviceChanged()
+
             // Reset pipeline manager error
             pipelineManager.error = false
 
diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index c255a29..48ce2ff 100644
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -230,6 +230,12 @@ Item {
         duration: recordingDuration.duration
     }
 
+    function resetToolBar() {
+        if (toolBar.depth() > 1) {
+            toolBar.pop()
+        }
+    }
+
     function doStartRecording() {
         if (!overlay.recording) {
             return
@@ -268,9 +274,7 @@ Item {
 
         trackerStore.storeVideo(file);
 
-        if (toolBar.depth() > 1) {
-            toolBar.pop()
-        }
+        resetToolBar()
     }
 
     function startRecording() {
@@ -320,4 +324,7 @@ Item {
         }
     }
 
+    function cameraDeviceChanged() {
+        resetToolBar()
+    }
 }
-- 
2.25.1