From cb9e977bf31bca26c56e6e4bf3f9d055c1f9d146 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Fri, 28 Sep 2012 14:58:07 +0200
Subject: [PATCH] Fix call logs issue

---
 Classes/HistoryDetailsViewController.m | 5 ++---
 Classes/HistoryViewController.m        | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m
index eefed13c2..89ea294cf 100644
--- a/Classes/HistoryDetailsViewController.m
+++ b/Classes/HistoryDetailsViewController.m
@@ -115,7 +115,6 @@ static UICompositeViewDescription *compositeDescription = nil;
                                              selector:@selector(update:) 
                                                  name:kLinphoneAddressBookUpdate
                                                object:nil];
-    [self update];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -155,11 +154,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)update {
     // Don't update if callLog is null
-    if(callLog==NULL) {
+    if(callLog == NULL) {
         return;
     }
     
-	LinphoneAddress* addr; 
+	LinphoneAddress* addr = NULL;
 	if (callLog->dir == LinphoneCallIncoming) {
 		addr = callLog->from;
 	} else {
diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m
index 18d3e5706..0f88429b7 100644
--- a/Classes/HistoryViewController.m
+++ b/Classes/HistoryViewController.m
@@ -181,8 +181,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (IBAction)onDeleteClick:(id) event {
 	linphone_core_clear_call_logs([LinphoneManager getLc]);
 	[tableController loadData];
-	[editButton toggle];
-	[self onEditClick:nil];
+    if([editButton isSelected]) {
+        [editButton toggle];
+        [self onEditClick:nil];
+    }
 }
 
 @end