diff --git a/coreapi/conference.cc b/coreapi/conference.cc index 74ec72372..7a2af3bde 100644 --- a/coreapi/conference.cc +++ b/coreapi/conference.cc @@ -409,6 +409,7 @@ int LocalConference::inviteAddresses(const std::list &ad LinphoneCall *call; /*toggle this flag so the call is immediately added to the conference upon acceptance*/ new_params->in_conference = TRUE; + linphone_call_params_enable_video(new_params, FALSE); /*turn off video as it is not supported for conferencing at this time*/ call = linphone_core_invite_address_with_params(m_core, addr, new_params); if (!call){ ms_error("LocalConference::inviteAddresses(): could not invite participant"); diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index f4671904a..4056c294b 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -3542,8 +3542,8 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const return NULL; } - /* this call becomes now the current one*/ - lc->current_call=call; + /* Unless this call is for a conference, it becomes now the current one*/ + if (linphone_call_params_get_local_conference_mode(params) == FALSE) lc->current_call=call; linphone_call_set_state (call,LinphoneCallOutgoingInit,"Starting outgoing call"); call->log->start_date_time=ms_time(NULL); linphone_call_init_media_streams(call);