]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10107 doh
authorAnthony Minessale <anthm@freeswitch.org>
Sat, 11 Mar 2017 03:25:04 +0000 (21:25 -0600)
committerKen Rice <krice@freeswitch.org>
Mon, 13 Mar 2017 14:55:04 +0000 (09:55 -0500)
src/mod/applications/mod_conference/conference_video.c

index 97020133880112cd97fc1dee0dbca52c50d3021c..438bcebcb8d65956ff115c30dda47dcef14c852d 100644 (file)
@@ -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);