From 615e2691a99947a0b12a275666be610844020246 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 17 Jul 2013 12:34:32 -0500 Subject: [PATCH] fix some regressions from recent changes --- src/mod/applications/mod_conference/mod_conference.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 1aa4022740..826e96157b 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1931,6 +1931,8 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr if (conference->video_floor_holder) { floor_holder = conference->video_floor_holder; + } else { + floor_holder = NULL; } @@ -5311,8 +5313,12 @@ static switch_status_t conf_api_sub_vid_floor(conference_member_t *member, switc if (member == NULL) return SWITCH_STATUS_GENERR; + if (!switch_channel_test_flag(member->channel, CF_VIDEO)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel %s does not have video capability!\n", switch_channel_get_name(member->channel)); + } + if (switch_test_flag(member->conference, CFLAG_VIDEO_BRIDGE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference %s is in video bridge mode, this functionality is not compatible\n", member->conference->name); return SWITCH_STATUS_FALSE; }