kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

FS-8172 #resolve [Regression from earlier commit to mod_conference breaks admin controls in verto demo app]

Browse Source
This commit is contained in:
Anthony Minessale 2015-09-16 13:20:57 -05:00
parent 8bdf956c0c
commit 3091301e34
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/conference_member.c
View File

@ -922,6 +922,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
member->status_field = cJSON_CreateString(""); member->status_field = cJSON_CreateString("");
cJSON_AddItemToArray(member->json, member->status_field); cJSON_AddItemToArray(member->json, member->status_field);
if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
switch_channel_get_variables(member->channel, &var_event); switch_channel_get_variables(member->channel, &var_event);
dvars = cJSON_CreateObject(); dvars = cJSON_CreateObject();
@ -939,6 +940,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
cJSON_AddItemToArray(member->json, dvars); cJSON_AddItemToArray(member->json, dvars);
switch_event_destroy(&var_event); switch_event_destroy(&var_event);
}
cJSON_AddItemToArray(member->json, cJSON_CreateNull()); cJSON_AddItemToArray(member->json, cJSON_CreateNull());