phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp
branchRCL_3
changeset 10 ba54057fe027
parent 0 5f000ab63145
child 12 b68fcd923911
--- a/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp	Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp	Tue May 11 16:13:03 2010 +0300
@@ -74,6 +74,7 @@
         {
         TRAP_IGNORE( iContactManager->ContactStoresL().CloseAll( *this ) );
         }
+    delete iContactStore;
     delete iContactManager;
     delete iContactStoreUris;
     }
@@ -360,6 +361,12 @@
 //
 void CPhCntContactManager::OpenComplete()
     {
+    if ( iStoreLoaderObserver )
+        {      
+        iStoreLoaderObserver->ContactStoreLoadingCompleted(
+           iContactStore, KErrNone );
+        iStoreLoaderObserver = NULL;
+        }
     }
 
 // ---------------------------------------------------------------------------
@@ -370,17 +377,16 @@
 void CPhCntContactManager::StoreReady(
     MVPbkContactStore& aContactStore )
     {
+    
     TVPbkContactStoreUriPtr uri = aContactStore.StoreProperties().Uri();
 
-    if ( iStoreLoaderObserver
-            && !iContactStoreUris->ContactStores().IsIncluded( uri ) )
+    if ( !iContactStoreUris->ContactStores().IsIncluded( uri ) )
         {
         TRAP_IGNORE( iContactStoreUris->AddContactStoreL( uri ) );
-
-        iStoreLoaderObserver->ContactStoreLoadingCompleted(
-            &aContactStore, KErrNone );
-        iStoreLoaderObserver = NULL;
         }
+    
+    iContactStore = &aContactStore;
+     
     iContactStoreUris->StoreReady( uri );
     }