From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 3 Oct 2012 14:05:38 +0000 (+0200)
Subject: Prevent double update of local media description + fix crash when edge detection... 
X-Git-Url: http://sjero.net/git/?a=commitdiff_plain;h=6b1a4479afcb9ed364374432d4991f56a876dc15;p=linphone

Prevent double update of local media description + fix crash when edge detection deactivates video.
---

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b0cc2bb5..4525e2a1 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2537,7 +2537,6 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
 	const char *subject;
 	call->camera_active=call->params.has_video;
-	update_local_media_description(lc,call);
 	if (call->ice_session != NULL)
 		linphone_core_update_local_media_description_from_ice(call->localdesc, call->ice_session);
 
@@ -2577,10 +2576,10 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 			call->videostream->ice_check_list = NULL;
 		}
 		call->params = *params;
+		update_local_media_description(lc, call);
 		if ((call->ice_session != NULL) && !has_video && params->has_video) {
 			/* Defer call update until the ICE candidates gathering process has finished. */
 			ms_message("Defer call update to gather ICE candidates");
-			update_local_media_description(lc, call);
 			linphone_call_init_video_stream(call);
 			video_stream_prepare_video(call->videostream);
 			if (linphone_core_gather_ice_candidates(lc,call)<0) {