From: Anthony Minessale Date: Sat, 11 Mar 2017 03:25:04 +0000 (-0600) Subject: FS-10107 doh X-Git-Tag: v1.6.16~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c51205a72ae24486a4e61f746dc50c83e7b0a1c;p=thirdparty%2Ffreeswitch.git FS-10107 doh --- diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 9702013388..438bcebcb8 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2578,7 +2578,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr } //VIDFLOOR - if (conference->video_mode == CONF_VIDEO_MODE_MUX && + if (conference->conference_video_mode == CONF_VIDEO_MODE_MUX && conference->canvas_count == 1 && canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder && imember->video_layer_id != canvas->layout_floor_id) { conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); @@ -3684,7 +3684,7 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_ conference->last_video_floor_holder = conference->video_floor_holder; } - if (conference->video_mode == CONF_VIDEO_MODE_MUX && + if (conference->conference_video_mode == CONF_VIDEO_MODE_MUX && conference->last_video_floor_holder && (imember = conference_member_get(conference, conference->last_video_floor_holder))) { switch_core_session_request_video_refresh(imember->session); conference_video_clear_managed_kps(imember);