From c9564a7dbec720488723d2a9d84d257372021c7d Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 28 Nov 2011 15:48:14 +0100
Subject: [PATCH] Check sound lock on merge and pause/resume

---
 src/org/linphone/IncallActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index dca0fba67..90f1851cd 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -260,7 +260,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
 			showDialog(numpadDialogId);
 			break;
 		case R.id.conf_simple_merge:
-			lc().addAllToConference();
+			if (!lc().soundResourcesLocked()) {
+				lc().addAllToConference();
+			}
 			break;
 		case R.id.conf_simple_pause:
 			LinphoneCall call = lc().getCurrentCall();
@@ -497,6 +499,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
 			v.setOnClickListener(new OnClickListener() {
 				@Override
 				public void onClick(View v) {
+					if (lc().soundResourcesLocked()) {
+						return;
+					}
 					State actualState = call.getState();
 					if (State.StreamsRunning == actualState) {
 						lc().pauseCall(call);