diff --git a/Classes/CallView.m b/Classes/CallView.m
index 370ce39d2..fa65b3054 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -256,8 +256,8 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
 	[_videoButton update];
 	[_hangupButton update];
 
-	_optionsButton.enabled = (!call || !linphone_call_media_in_progress(call));
-	_optionsTransferButton.enabled = call && !linphone_call_media_in_progress(call);
+	_optionsButton.enabled = (!call || !linphone_core_sound_resources_locked(LC));
+	_optionsTransferButton.enabled = call && !linphone_core_sound_resources_locked(LC);
 	// enable conference button if 2 calls are presents and at least one is not in the conference
 	int confSize = linphone_core_get_conference_size(LC) - (linphone_core_is_in_conference(LC) ? 1 : 0);
 	_optionsConferenceButton.enabled =
diff --git a/Classes/LinphoneUI/UIPauseButton.m b/Classes/LinphoneUI/UIPauseButton.m
index 1bc3cbd39..154b2d287 100644
--- a/Classes/LinphoneUI/UIPauseButton.m
+++ b/Classes/LinphoneUI/UIPauseButton.m
@@ -152,7 +152,7 @@
 			if (c != nil) {
 				LinphoneCallState state = linphone_call_get_state(c);
 				ret = (state == LinphoneCallPaused || state == LinphoneCallPausing);
-				self.enabled = !linphone_call_media_in_progress(c) &&
+				self.enabled = !linphone_core_sound_resources_locked(LC) &&
 							   (state == LinphoneCallPaused || state == LinphoneCallPausing ||
 								state == LinphoneCallStreamsRunning);
 			} else {
diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m
index 81c9a0379..60383ece7 100644
--- a/Classes/LinphoneUI/UIVideoButton.m
+++ b/Classes/LinphoneUI/UIVideoButton.m
@@ -77,7 +77,7 @@ INIT_WITH_COMMON_CF {
 	bool video_enabled = false;
 	LinphoneCall *currentCall = linphone_core_get_current_call(LC);
 	if (linphone_core_video_supported(LC)) {
-		if (linphone_core_video_display_enabled(LC) && currentCall && !linphone_call_media_in_progress(currentCall) &&
+		if (linphone_core_video_display_enabled(LC) && currentCall && !linphone_core_sound_resources_locked(LC) &&
 			linphone_call_get_state(currentCall) == LinphoneCallStreamsRunning) {
 			video_enabled = TRUE;
 		}
diff --git a/submodules/linphone b/submodules/linphone
index f734477ce..07d92908c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f734477ce43e19e492b4650965b4c286fc19523e
+Subproject commit 07d92908ca10bb934cb12ff153c8e79c501e3826