From 0747c6e87faafb0429d55df4406cad4b840f129d Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Wed, 11 Jan 2017 14:30:05 +0900 Subject: [PATCH] [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 --- adaptors/ecore/common/ecore-indicator-impl.cpp | 2 ++ adaptors/tizen/ecore-indicator-impl-tizen.cpp | 2 ++ 2 files changed, 4 insertions(+) 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 ); -- 2.7.4