From b7dacbd01a6a9f84560033413f000597f469a718 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 3 Oct 2011 10:50:40 +0200
Subject: [PATCH] do not set lc->current_call for a call that is in a
 conference

---
 coreapi/callbacks.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index be84c6341..a307a1c5f 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -333,7 +333,8 @@ static void call_accepted(SalOp *op){
 			}
 			linphone_core_update_streams (lc,call,md);
 			linphone_call_set_state(call, LinphoneCallStreamsRunning, "Streams running");
-			lc->current_call=call;
+			if (!call->current_params.in_conference)
+				lc->current_call=call;
 		}
 	}else{
 		/*send a bye*/
@@ -391,7 +392,8 @@ static void call_updating(SalOp *op){
 				if(lc->vtable.display_status)
 					lc->vtable.display_status(lc,_("We have been resumed..."));
 				linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)");
-				lc->current_call=call;
+				if (!call->current_params.in_conference)
+					lc->current_call=call;
 			}else{
 				prevstate=call->state;
 				linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");