diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 02db3b54fa81587695303405263bd7120262b980..f60640160f3f9cb7d16a989afb4479e61100e133 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2838,10 +2838,13 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
 **/
 int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
 	int err=0;
+#ifdef VIDEO_ENABLED
+	bool_t has_video = FALSE;
+#endif
 	if (params!=NULL){
 		linphone_call_set_state(call,LinphoneCallUpdating,"Updating call");
 #ifdef VIDEO_ENABLED
-		bool_t has_video = call->params.has_video;
+		has_video = call->params.has_video;
 
 		// Video removing
 		if((call->videostream != NULL) && !params->has_video) {
@@ -4677,9 +4680,9 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
  * If not set the core will create its own window.
 **/
 void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id){
-	lc->preview_window_id=id;
 #ifdef VIDEO_ENABLED
 	LinphoneCall *call=linphone_core_get_current_call(lc);
+	lc->preview_window_id=id;
 	if (call!=NULL && call->videostream){
 		video_stream_set_native_preview_window_id(call->videostream,id);
 	}else if (lc->previewstream){
@@ -4693,8 +4696,8 @@ void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long
 **/
 void linphone_core_show_video(LinphoneCore *lc, bool_t show){
 #ifdef VIDEO_ENABLED
-	ms_error("linphone_core_show_video %d", show);
 	LinphoneCall *call=linphone_core_get_current_call(lc);
+	ms_error("linphone_core_show_video %d", show);
 	if (call!=NULL && call->videostream){
 		video_stream_show_video(call->videostream,show);
 	}
@@ -4730,9 +4733,11 @@ void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation) {
 	ms_message("%s : rotation=%d\n", __FUNCTION__, rotation);
 	lc->device_rotation = rotation;
 #ifdef VIDEO_ENABLED
-	LinphoneCall *call=linphone_core_get_current_call(lc);
-	if (call!=NULL && call->videostream){
-		video_stream_set_device_rotation(call->videostream,rotation);
+	{
+		LinphoneCall *call=linphone_core_get_current_call(lc);
+		if (call!=NULL && call->videostream){
+			video_stream_set_device_rotation(call->videostream,rotation);
+		}
 	}
 #endif
 }