diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index 436e65921..0768fa60d 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -932,7 +932,11 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
         } else {
             switch (linphone_call_get_state(call)) {
                 case LinphoneCallPaused:
-                    [ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil];
+                    if(!linphone_core_sound_resources_locked(linphone_call_get_core(call))) {
+                        [ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil];
+                    } else {
+                        [ms appendFormat:@"%@", NSLocalizedString(@"Paused", nil), nil];
+                    }
                     break;
                 case LinphoneCallOutgoingInit:
                 case LinphoneCallOutgoingProgress:
@@ -1242,7 +1246,9 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
         if (linphone_core_is_in_conference(lc)) {
             linphone_core_leave_conference(lc);
         }
-        linphone_core_resume_call([LinphoneManager getLc], selectedCall);
+        if(!linphone_core_sound_resources_locked(lc)) {
+            linphone_core_resume_call([LinphoneManager getLc], selectedCall);
+        }
     }
     
     [self updateUIFromLinphoneState: YES];
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index b59ceb3c1..3976201b0 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -1596,7 +1596,7 @@
 					HAVE_SILK,
 				);
 				GCC_THUMB_SUPPORT = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -1662,7 +1662,7 @@
 					HAVE_SILK,
 				);
 				GCC_THUMB_SUPPORT = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -1938,7 +1938,7 @@
 					HAVE_SILK,
 				);
 				GCC_THUMB_SUPPORT = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -2005,7 +2005,7 @@
 					HAVE_SILK,
 				);
 				GCC_THUMB_SUPPORT = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
diff --git a/submodules/linphone b/submodules/linphone
index bad6c152f..2d669353c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bad6c152f1521de8648d47c70e9321b7668b40b5
+Subproject commit 2d669353c3eda22e63023fde2f3cde7b437d2c81