mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix 'presentModelViewController' crash for iOS 5 with multicall

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-11-08 15:18:10 +01:00
parent 2ef541de04
commit 28f114cf29
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Classes/AdvancedPhoneViewController.m
View file

@ -52,7 +52,8 @@
}
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
if (linphone_call_get_dir(call)==LinphoneCallIncoming){
if (self.presentedViewController != mIncallViewController &&
linphone_call_get_dir(call)==LinphoneCallIncoming){
[self presentModalViewController:mIncallViewController animated:true];
}

3
linphone.xcodeproj/project.pbxproj
View file

@ -403,8 +403,6 @@
22F2508D107141E100AC9B3F /* PhoneViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneViewController.xib; sourceTree = "<group>"; };
22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/ringback.wav"; sourceTree = "<group>"; };
22F51EF5107FA66500F98953 /* untitled.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = untitled.plist; sourceTree = "<group>"; };
22F9D6B51463EBDC00C6FEAF /* AdvancedPhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedPhoneViewController.m; sourceTree = "<group>"; };
22F9D6B61463EBDC00C6FEAF /* AdvancedPhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedPhoneViewController.h; sourceTree = "<group>"; };
288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = "<group>"; };
@ -811,7 +809,6 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
F0A486D71404FE53009EC0BE /* libsrtp.a */,
2214783B1386A2030020F8B8 /* Localizable.strings */,
22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */,
223148E51178A09900637D6A /* libmsilbc.a */,

2
submodules/linphone

@ -1 +1 @@
Subproject commit f13744a765200961c74617c12295d04640a74f05
Subproject commit 9d7b218163752f7d76c59b6d873be222b3b97583