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 0cef50bec427645995383b763bddb5ca11b1fcbf..2689acb62aaf4619acc9b4104946571589865e12 100644 (file)
--- 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 {