From 3445cd7de5156416928b3f9f6e8ab09295891ef2 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 7 Dec 2011 17:08:25 +0100
Subject: [PATCH] Update incall conf ui when pausing/leaving conference.

---
 src/org/linphone/IncallActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index fc632f41c..6711cd0a3 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -81,8 +81,12 @@ public class IncallActivity extends AbstractCalleesActivity implements
 
 	private void pauseCurrentCallOrLeaveConference() {
 		LinphoneCall call = lc().getCurrentCall();
-		if (call != null) lc().pauseCall(call);
-		lc().leaveConference();
+		if (call != null && !call.isInConference()) {
+			lc().pauseCall(call);
+		} else {
+			lc().leaveConference();
+			updateConfItem();
+		}
 	}
 
 	private View mConferenceVirtualCallee;