mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-26 11:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Possible fix for first boot error

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-10-14 19:41:19 +02:00
parent 23e5b3c983
commit f81b7e1337
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Classes/LinphoneAppDelegate.m
View file

@ -170,7 +170,7 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
UIApplication* app= [UIApplication sharedApplication]; UIApplication* app= [UIApplication sharedApplication];
if( [app respondsToSelector:@selector(registerUserNotificationSettings:)] ){ if( [app respondsToSelector:@selector(registerUserNotificationSettings:)] ){
@ -225,15 +225,8 @@
[[LinphoneManager instance] startLibLinphone]; [[LinphoneManager instance] startLibLinphone];
} }
if([LinphoneManager isLcReady]) { if([LinphoneManager isLcReady]) {
[self.window makeKeyAndVisible];
[[PhoneMainView instance] startUp];
// Only execute one time at application start
if(!started) {
started = TRUE;
[self.window makeKeyAndVisible];
[RootViewManager setupWithPortrait:(PhoneMainView*)self.window.rootViewController];
[[PhoneMainView instance] startUp];
}
} }
} }

5
Classes/PhoneMainView.m
View file

@ -54,6 +54,11 @@ static RootViewManager* rootViewManagerInstance = nil;
} }
+ (RootViewManager *)instance { + (RootViewManager *)instance {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
PhoneMainView* portrait = (PhoneMainView*)[(LinphoneAppDelegate*)([UIApplication sharedApplication].delegate) window].rootViewController;
rootViewManagerInstance =[[RootViewManager alloc]initWithPortrait:portrait];
});
if( !rootViewManagerInstance ){ if( !rootViewManagerInstance ){
@throw [NSException exceptionWithName:@"RootViewManager" reason:@"nil instance" userInfo:nil]; @throw [NSException exceptionWithName:@"RootViewManager" reason:@"nil instance" userInfo:nil];
} }