From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Wed, 11 Jan 2017 05:30:05 +0000 (+0900)
Subject: [3.0] Fix crash by Indicator lock file error
X-Git-Tag: accepted/tizen/3.0/common/20170113.182304^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F109656%2F3;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[3.0] Fix crash by Indicator lock file error

  If dali can't open indicator lock file,
  dali should not try to render indicator image.

Change-Id: I668f633f37cfbf368320570ff2b7fa9784a7ee1b
---

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index e3bf901..c9cefb4 100644
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -988,6 +988,8 @@ void Indicator::LoadSharedImage( Ecore_Ipc_Event_Server_Data *epcEvent )
       if( mSharedFileInfo[n].mLock->RetrieveAndClearErrorStatus() )
       {
         DALI_LOG_ERROR( "### Indicator error: Cannot open lock file %s ###\n", mSharedFileInfo[n].mLockFileName.c_str() );
+
+        return;
       }
 
       CreateNewImage( n );
diff --git a/adaptors/tizen/ecore-indicator-impl-tizen.cpp b/adaptors/tizen/ecore-indicator-impl-tizen.cpp
index 660a669..b5dbdec 100644
--- a/adaptors/tizen/ecore-indicator-impl-tizen.cpp
+++ b/adaptors/tizen/ecore-indicator-impl-tizen.cpp
@@ -1006,6 +1006,8 @@ void Indicator::LoadSharedImage( Ecore_Ipc_Event_Server_Data *epcEvent )
       if( mSharedFileInfo[n].mLock->RetrieveAndClearErrorStatus() )
       {
         DALI_LOG_ERROR( "### Indicator error: Cannot open lock file %s ###\n", mSharedFileInfo[n].mLockFileName.c_str() );
+
+        return;
       }
 
       CreateNewImage( n );