N_SE-45845 issue fix

Change-Id: Ieeffdc3a5a28af41b964e5410be491dbde2d2d76
Signed-off-by: Oleksandr Kaspruk <a.kaspruk@samsung.com>

diff --git a/project/inc/FeatureSetGenerator.h b/project/inc/FeatureSetGenerator.h
index eb3b242..94152f1 100644 (file)
--- a/project/inc/FeatureSetGenerator.h
+++ b/project/inc/FeatureSetGenerator.h
@@ -49,6 +49,7 @@ public:
     void SetImagePath(const Tizen::Base::String& imPath);
     void SetFeatureManager(Tizen::Uix::Vision::ImageFeatureManager* pImageFeatureManager);
     void GetResults(ResultInfo&);
+    bool IsGenerating(void) { return __isGenerating; };
 
 private:
     Tizen::Base::Object* Run(void);
@@ -62,6 +63,7 @@ private:
     ResultInfo                                                 __resultInfo;
     Tizen::Base::Collection::ArrayListT<Tizen::Base::String>   __files;
     Tizen::Uix::Vision::ImageFeatureManager*                   __pImageFeatureManager;
+    bool                                                       __isGenerating;
 
 private:
     class StrComparer

diff --git a/project/src/FeatureSetGenerator.cpp b/project/src/FeatureSetGenerator.cpp
index b5ef4b8..e9b5ca5 100644 (file)
--- a/project/src/FeatureSetGenerator.cpp
+++ b/project/src/FeatureSetGenerator.cpp
@@ -23,6 +23,7 @@
 FeatureSetGenThread::FeatureSetGenThread(void)
     : __pListener(0)
        , __pImageFeatureManager(0)
+    , __isGenerating(false)
 {
 }
 
@@ -44,8 +45,12 @@ FeatureSetGenThread::Run(void)
     __resultInfo.appendedObjectsNumber = 0;
     __resultInfo.rejectedObjectsNumber = 0;
 
+    __isGenerating = true;
+
     Generate(__imagePath, __resultInfo);
 
+    __isGenerating = false;
+
     if (__pListener)
     {
         __pListener->OnFinish();

diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp
index 048f217..8649b4e 100644 (file)
--- a/project/src/MainForm.cpp
+++ b/project/src/MainForm.cpp
@@ -129,7 +129,10 @@ result
 MainForm::OnTerminating(void)
 {
     result r = E_SUCCESS;
-    __dbGen.Exit();
+    if (__dbGen.IsGenerating())
+    {
+        __dbGen.Exit();
+    }
     return r;
 }