kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix empty +flags{} pre-empting conference_member_flags variable

This commit is contained in:
Anthony Minessale 2013-06-26 16:04:28 -05:00
parent 182d67ae95
commit 75e0d9d885
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_conference/mod_conference.c
View File

@ -7350,7 +7350,7 @@ SWITCH_STANDARD_APP(conference_function)
char *bridgeto = NULL;
char *profile_name = NULL;
switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL;
const char *flags_str;
const char *flags_str, *v_flags_str;
member_flag_t mflags = 0;
switch_core_session_message_t msg = { 0 };
uint8_t rl = 0, isbr = 0;
@ -7402,8 +7402,14 @@ SWITCH_STANDARD_APP(conference_function)
if ((p = strchr(flags_str, '}'))) {
*p = '\0';
}
} else {
flags_str = switch_channel_get_variable(channel, "conference_member_flags");
}
if ((v_flags_str = switch_channel_get_variable(channel, "conference_member_flags"))) {
if (zstr(flags_str)) {
flags_str = v_flags_str;
} else {
flags_str = switch_core_session_sprintf(session, "%s|%s", flags_str, v_flags_str);
}
}
/* is this a bridging conference ? */