From dd5f86e420a56b30193337f154e398d5754b71c7 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 15 Jul 2015 12:09:48 +0200 Subject: [PATCH] LinphoneCoreSettingsStore: do not synchronize settings in init, it will be done when view is visible --- Classes/LinphoneCoreSettingsStore.m | 1 - Classes/SettingsViewController.m | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 643bc2c46..d983e88d3 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -31,7 +31,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); if (self) { dict = [[NSMutableDictionary alloc] init]; changedDict = [[NSMutableDictionary alloc] init]; - [self transformLinphoneCoreToKeys]; } return self; } diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 2fd4cf558..a39768712 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -444,7 +444,8 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [settingsStore transformLinphoneCoreToKeys]; // Sync settings with linphone core settings + // Sync settings with linphone core settings + [settingsStore transformLinphoneCoreToKeys]; settingsController.hiddenKeys = [self findHiddenKeys]; [settingsController.tableView reloadData];