From c38a0f33a475ef833c3a15fbc3532118dba0e7fb Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 6 Aug 2015 19:08:31 -0500 Subject: [PATCH] don't mix personal canvas and multi-canvas modes --- src/mod/applications/mod_conference/mod_conference.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 22ceb2300d..7b513826d1 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -3125,6 +3125,11 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co if (video_canvas_count < 1) video_canvas_count = 1; + if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS) && video_canvas_count) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Personal Canvas and Multi-Canvas modes are not compatable. 1 canvas will be used.\n"); + video_canvas_count = 1; + } + if (conference->conference_video_mode == CONF_VIDEO_MODE_MUX) { video_layout_t *vlayout = conference_video_get_layout(conference, conference->video_layout_name, conference->video_layout_group);