From 97210e2ec102536820e10f6ca180a8192e447287 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 11 Jan 2013 10:34:48 +0100
Subject: [PATCH] Fix issue where user can't resume a call when two calls are
 paused at the same time

---
 src/org/linphone/InCallActivity.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index d894df2e7..994262ebb 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -360,7 +360,7 @@ public class InCallActivity extends FragmentActivity implements
 
 		else if (id == R.id.callStatus) {
 			LinphoneCall call = (LinphoneCall) v.getTag();
-			pauseOrResumeCall(call, true);
+			pauseOrResumeCall(call);
 		}
 		else if (id == R.id.conferenceStatus) {
 			pauseOrResumeConference();
@@ -484,10 +484,10 @@ public class InCallActivity extends FragmentActivity implements
 	private void pauseOrResumeCall() {
 		LinphoneCore lc = LinphoneManager.getLc();
 		LinphoneCall call = lc.getCurrentCall();
-		pauseOrResumeCall(call, false);
+		pauseOrResumeCall(call);
 	}
 	
-	public void pauseOrResumeCall(LinphoneCall call, boolean leaveConference) {
+	public void pauseOrResumeCall(LinphoneCall call) {
 		LinphoneCore lc = LinphoneManager.getLc();
 		if (call != null && LinphoneUtils.isCallRunning(call)) {
 			if (call.isInConference()) {
@@ -515,6 +515,13 @@ public class InCallActivity extends FragmentActivity implements
 					}
 					pause.setImageResource(R.drawable.pause_off);
 				}
+			} else if (call != null) {
+				lc.resumeCall(call);
+				if (isVideoCallPaused) {
+					isVideoCallPaused = false;
+					showVideoView();
+				}
+				pause.setImageResource(R.drawable.pause_off);
 			}
 		}
 	}