From 096d75c6894a519ee970dbd554130606ba1ff7a4 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Wed, 8 May 2013 20:06:47 +0900 Subject: [PATCH] [content] Remove DB notification in destructor Change-Id: I93039b7feb1c35761106c30f368610d9c43b5457 Signed-off-by: Seokpil Park --- src/FCnt_ContentManagerImpl.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/FCnt_ContentManagerImpl.cpp b/src/FCnt_ContentManagerImpl.cpp index 192d387..77bda46 100644 --- a/src/FCnt_ContentManagerImpl.cpp +++ b/src/FCnt_ContentManagerImpl.cpp @@ -147,6 +147,7 @@ OnContentUpdateCompleted(media_content_error_e error, int pid, media_content_db_ SysTryLogReturn(NID_CNT, user_data != null, , "OnContentUpdateCompleted failed."); _ContentManagerImpl* pTempManagerImpl = static_cast< _ContentManagerImpl* >(user_data); + SysTryLogReturn(NID_CNT, pTempManagerImpl != null, , "pTempManagerImpl is null."); IContentUpdateEventListener* pListener = pTempManagerImpl->GetListener(); SysTryLogReturn(NID_CNT, pListener != null, , "IContentUpdateEventListener is null."); @@ -240,7 +241,17 @@ _ContentManagerImpl::_ContentManagerImpl(void) _ContentManagerImpl::~_ContentManagerImpl(void) { - int val = media_content_disconnect(); + int val; + + if (GetListener()) + { + val = media_content_unset_db_updated_cb(); + SysLog(NID_CNT, "media_content_unset_db_updated_cb result[%d].", val); + + SetListener(null); + } + + val = media_content_disconnect(); SysLog(NID_CNT, "media_content_disconnect result[%d].", val); __isConnected = false; -- 2.7.4