X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftimers.cpp;h=88bbb3e2501a64bd5af2d82bf219d39db7aae325;hb=5bbec6485902eab5202fb8d89c0ec8d5c4ddd891;hp=01849530fc4397fa73136962d21f7d32c49e1955;hpb=3c0a57e91bb919dd1c7bd0536278fb7753b8a77a;p=xestiaab%2F.git

diff --git a/source/common/timers.cpp b/source/common/timers.cpp
index 0184953..88bbb3e 100644
--- a/source/common/timers.cpp
+++ b/source/common/timers.cpp
@@ -315,13 +315,7 @@ void wxActListProcTimer::Notify(){
 		adt = adt.Now();
         
 		ActListFinDTPtr->insert(std::make_pair(iter->first, adt));
-        
-		// Delete the connection object.
-	
-		std::map<int, CardDAV*>::iterator ConnObject = ActListConnPtr->find(iter->first);
-		delete ConnObject->second;
-		ConnObject->second = NULL;
-	
+
 	}
     
 	if (ClearupProcessed == TRUE){
@@ -429,13 +423,13 @@ void wxETagProcessTimer::ReloadAccounts(){
         
 		AccountDir = PrefData.accounts.GetAccountDirectory(i);
 		AccountType = PrefData.accounts.GetAccountType(i);
-        
+		
 		if (AccountDir.IsEmpty()){
 			continue;
 		}
         
-		if (AccountType == wxT("Local") || AccountType == wxT("local")){
-		continue;
+		if (AccountType != wxT("CardDAV") && AccountType != wxT("carddav")){
+			continue;
 		}
         
 		AccountDir.Trim();