From 23a55d699f8f063d0ceced7a32beb93dac865dbe Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Mon, 20 Aug 2012 12:02:03 +0200
Subject: [PATCH] Synchronize settings

---
 Classes/LinphoneManager.m | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 28c55caad..0176c2513 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -595,6 +595,8 @@ static LinphoneCoreVTable linphonec_vtable = {
 	linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
     
     [self setupNetworkReachabilityCallback];
+    /* MODIFICATION: Update following NSUserDefault settings */
+    [self reconfigureLinphoneIfNeeded:nil];
 	
 	// start scheduler
 	mIterateTimer = [NSTimer scheduledTimerWithTimeInterval:0.1 
@@ -746,7 +748,11 @@ static LinphoneCoreVTable linphonec_vtable = {
 }
 
 - (void)becomeActive {
-    [self refreshRegisters];
+    /* MODIFICATION Use NSSUerDefault settings */
+    if (![self reconfigureLinphoneIfNeeded:currentSettings]) {
+        [self refreshRegisters];
+    }
+    /**/
     
 	/*IOS specific*/
 	linphone_core_start_dtmf_stream(theLinphoneCore);