From 92aa8e10c8ead9cde1626b1cd5ec4e115f2416a8 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 30 Dec 2015 16:42:02 -0500 Subject: [PATCH] FS-8683: [mod_conference] fix seg originating non video call into mcu video conference --- src/mod/applications/mod_conference/conference_video.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index a955477ac0..031f8f3357 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2595,8 +2595,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr int i = 0; mcu_layer_t *floor_layer = NULL; - if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO || switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY) || - switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) { + if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) || + (switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY) || + (switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS)) { continue; }