X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallIncomingCallForm.cpp;h=7b4a2c773c32cae8d9b155f3302b4147ae265a13;hb=e957f280f9553acf9d1418818f24b1df77a72e3d;hp=2adcc586b6d7ac33126cdaaadf9d1d6610e07f7a;hpb=6a3ed04a7ca44470fdfeb8f35980f99eab5314b2;p=apps%2Fosp%2FCall.git

diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp
index 2adcc58..7b4a2c7 100644
--- a/src/CallIncomingCallForm.cpp
+++ b/src/CallIncomingCallForm.cpp
@@ -218,14 +218,7 @@ IncomingCallForm::OnInitializing(void)
 	}
 	HideRejectPanel();
 
-	//Get Reject list from Settings Manager
-	IMapT<int,String>* pMsgMap = SettingsManager::GetInstance()->GetRejectMessageListN();
-	if(pMsgMap != null)
-	{
-		__pRejectMessageList = pMsgMap->GetValuesN();
-		delete pMsgMap;
-		pMsgMap = null;
-	}
+
 	InitializeTableView();
 
 	__pAcceptCircle = AppUtility::GetBitmapFromResourcesN(IDB_ACCEPT_CIRCLE_ICON, W_DIAL_LABEL, H_DIAL_LABEL);
@@ -721,6 +714,28 @@ void
 IncomingCallForm::OnSceneActivatedN(const SceneId& previousSceneId,	const SceneId& currentSceneId, IList* pArgs)
 {
 	AddOrientationEventListener(*this);
+	//Get Reject list from Settings Manager
+	IMapT<int,String>* pMsgMap = SettingsManager::GetInstance()->GetRejectMessageListN();
+	if(pMsgMap != null)
+	{
+		if (__pRejectMessageList != null)
+		{
+			delete __pRejectMessageList;
+			__pRejectMessageList = null;
+		}
+		__pRejectMessageList = pMsgMap->GetValuesN();
+		delete pMsgMap;
+		pMsgMap = null;
+	}
+	//No reject messages
+	else
+	{
+		if (__pRejectMessageList != null)
+		{
+			delete __pRejectMessageList;
+			__pRejectMessageList = null;
+		}
+	}
 	//listen to Foreground events
 	CallApp* pPhoneApp = static_cast<CallApp*>(CallApp::GetInstance());
 	pPhoneApp->AddAppStateChangeListener(*this);