Unset QtCamdevice viewfinder when Viewfinder is being destructed.

[harmattan/cameraplus] / declarative / viewfinder.cpp

diff --git a/declarative/viewfinder.cpp b/declarative/viewfinder.cpp
index 841fd14..c8f7d44 100644 (file)
--- a/declarative/viewfinder.cpp
+++ b/declarative/viewfinder.cpp
@@ -58,7 +58,13 @@ Viewfinder::Viewfinder(QQuickItem *parent) :
 }
 
 Viewfinder::~Viewfinder() {
+  if (m_cam) {
+    m_cam->stop(true);
+  }
 
+  if (m_dev) {
+    m_dev->setViewfinder(0);
+  }
 }
 
 bool Viewfinder::isRenderingEnabled() const {