From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 27 Jan 2012 18:24:46 +0000 (-0600)
Subject: only enforce the video-bridge mode if the flag is set on the conference too
X-Git-Tag: v1.2-rc1~19^2~1^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daa49c06e2466b57124266e1d3fe8f49d455959f;p=thirdparty%2Ffreeswitch.git

only enforce the video-bridge mode if the flag is set on the conference too
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 0cef50bec4..2689acb62a 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1383,7 +1383,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 				if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO)) {
 					members_with_video++;
 					
-					if (switch_test_flag(imember, MFLAG_VIDEO_BRIDGE)) {
+					if (switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) && switch_test_flag(imember, MFLAG_VIDEO_BRIDGE)) {
 						if (!video_bridge_members[0]) {
 							video_bridge_members[0] = imember;
 						} else {