From eb96fdc9d398defefa07ce48cf1fae213898029f Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Mon, 20 Aug 2012 11:13:10 +0200
Subject: [PATCH] Fix database opening if original file doesn't exist

---
 Classes/LinphoneManager.m                      | 4 ++++
 Classes/LinphoneUI/UICompositeViewController.m | 1 +
 Classes/PhoneMainView.h                        | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index e1fc78eb5..0c999466c 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -234,6 +234,10 @@ struct codec_name_pref_table codec_pref_table[]={
     if ([fileManager fileExistsAtPath:databaseDocumentPath] == NO) {
         [LinphoneLogger logc:LinphoneLoggerLog format:"Create sqlite3 database"];
         NSString *resourceDocumentPath = [[NSBundle mainBundle] pathForResource:@"database" ofType:@"sqlite"];
+        if ([fileManager fileExistsAtPath:resourceDocumentPath] == NO) {
+            [LinphoneLogger log:LinphoneLoggerError format:@"Can't find original database: %@", [error localizedDescription]];
+            return;
+        }
         [fileManager copyItemAtPath:resourceDocumentPath toPath:databaseDocumentPath error:&error];
         if(error != nil) {
             [LinphoneLogger log:LinphoneLoggerError format:@"Can't copy database: %@", [error localizedDescription]];
diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index 1c5362d37..2b18de7c1 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -245,6 +245,7 @@
 }
 
 - (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
     [self clearCache];
 }
 
diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h
index 68e4bf9f2..b79f53403 100644
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@@ -43,7 +43,6 @@
     @private
     UICompositeViewController *mainViewController;
 
-    UIActionSheet *incomingCallActionSheet;
     UIActionSheet *batteryActionSheet;
     
     int loadCount;