kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 08:29:45 +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

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

@ -922,24 +922,26 @@ 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);
switch_channel_get_variables(member->channel, &var_event); if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
switch_channel_get_variables(member->channel, &var_event);
dvars = cJSON_CreateObject(); dvars = cJSON_CreateObject();
for (hi = var_event->headers; hi; hi = hi->next) { for (hi = var_event->headers; hi; hi = hi->next) {
if (!strncasecmp(hi->name, "verto_dvar_", 11)) { if (!strncasecmp(hi->name, "verto_dvar_", 11)) {
char *var = hi->name + 11; char *var = hi->name + 11;
if (var) { if (var) {
cJSON_AddItemToObject(dvars, var, cJSON_CreateString(hi->value)); cJSON_AddItemToObject(dvars, var, cJSON_CreateString(hi->value));
}
} }
} }
cJSON_AddItemToArray(member->json, dvars);
switch_event_destroy(&var_event);
} }
cJSON_AddItemToArray(member->json, dvars);
switch_event_destroy(&var_event);
cJSON_AddItemToArray(member->json, cJSON_CreateNull()); cJSON_AddItemToArray(member->json, cJSON_CreateNull());
conference_member_update_status_field(member); conference_member_update_status_field(member);