From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 17 Jul 2013 17:34:32 +0000 (-0500)
Subject: fix some regressions from recent changes
X-Git-Tag: v1.5.3~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615e2691a99947a0b12a275666be610844020246;p=thirdparty%2Ffreeswitch.git

fix some regressions from recent changes
---

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;
 	}