From 6c3bf9ae65da97c0357a3c56a4cef3fe148e01b7 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 20 Nov 2015 14:40:23 -0600 Subject: [PATCH] FS-8554 #resolve [VC Moderator button quit working after moderator screen shares] --- src/mod/applications/mod_conference/conference_event.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_event.c b/src/mod/applications/mod_conference/conference_event.c index 21f5fed82e..d5b094e978 100644 --- a/src/mod/applications/mod_conference/conference_event.c +++ b/src/mod/applications/mod_conference/conference_event.c @@ -381,7 +381,7 @@ void conference_event_adv_la(conference_obj_t *conference, conference_member_t * switch_channel_set_flag(member->channel, CF_VIDEO_REFRESH_REQ); switch_core_media_gen_key_frame(member->session); - if (conference && conference->la && member->session) { + if (conference && conference->la && member->session && !switch_channel_test_flag(member->channel, CF_VIDEO_ONLY)) { cJSON *msg, *data; const char *uuid = switch_core_session_get_uuid(member->session); const char *cookie = switch_channel_get_variable(member->channel, "event_channel_cookie"); @@ -409,14 +409,6 @@ void conference_event_adv_la(conference_obj_t *conference, conference_member_t * cJSON_AddItemToObject(data, "secondScreen", cJSON_CreateTrue()); } - if (switch_channel_test_flag(member->channel, CF_VIDEO_ONLY)) { - cJSON_AddItemToObject(data, "videoOnly", cJSON_CreateTrue()); - } - - if (switch_true(switch_channel_get_variable_dup(member->channel, "video_screen_share", SWITCH_FALSE, -1))) { - cJSON_AddItemToObject(data, "screenShare", cJSON_CreateTrue()); - } - if (conference_utils_member_test_flag(member, MFLAG_MOD)) { cJSON_AddItemToObject(data, "modChannel", cJSON_CreateString(conference->mod_event_channel)); }