Camera error handling added.

Change-Id: I9c99e2b3086c433b2987057215bf34d6aeb4e0c4

diff --git a/project/src/CameraTools.cpp b/project/src/CameraTools.cpp
index 028eaf0..6c02ec8 100644 (file)
--- a/project/src/CameraTools.cpp
+++ b/project/src/CameraTools.cpp
@@ -207,15 +207,16 @@ CameraTools::Restart(void)
 
                if (!res)
                {
+                       res = true;
                        MessageBox msgBox;
-                       int res = 0;
+                       int r = 0;
 
-                       msgBox.Construct("Warning", "Cannot restart camera. Terminating application.", MSGBOX_STYLE_NONE, 5000);
-                       msgBox.ShowAndWait(res);
+                       msgBox.Construct("Warning", "Camera error occurred. Terminating application.", MSGBOX_STYLE_OK, 0);
+                       msgBox.ShowAndWait(r);
 
-                       switch (res)
+                       switch (r)
                        {
-                               case MSGBOX_RESULT_CLOSE:
+                               case MSGBOX_RESULT_OK:
                                        Tizen::App::Application::GetInstance()->Terminate();
                                        return;
                                        break;

diff --git a/project/src/Tracker.cpp b/project/src/Tracker.cpp
index 27127ba..63ebf64 100644 (file)
--- a/project/src/Tracker.cpp
+++ b/project/src/Tracker.cpp
@@ -134,6 +134,9 @@ Tracker::OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r)
 void
 Tracker::OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r)
 {
+       AppLogExceptionTag("CameraTools", "Camera state %i, Camera error reason %i", CameraTools::GetCamera()->GetState(), r);
+
+       CameraTools::Restart();
 }
 
 void