提交 75e0d9d8 authored 作者: Anthony Minessale's avatar Anthony Minessale

fix empty +flags{} pre-empting conference_member_flags variable

上级 182d67ae
...@@ -7350,7 +7350,7 @@ SWITCH_STANDARD_APP(conference_function) ...@@ -7350,7 +7350,7 @@ SWITCH_STANDARD_APP(conference_function)
char *bridgeto = NULL; char *bridgeto = NULL;
char *profile_name = NULL; char *profile_name = NULL;
switch_xml_t cxml = NULL, cfg = NULL, profiles = 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; member_flag_t mflags = 0;
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t msg = { 0 };
uint8_t rl = 0, isbr = 0; uint8_t rl = 0, isbr = 0;
...@@ -7402,8 +7402,14 @@ SWITCH_STANDARD_APP(conference_function) ...@@ -7402,8 +7402,14 @@ SWITCH_STANDARD_APP(conference_function)
if ((p = strchr(flags_str, '}'))) { if ((p = strchr(flags_str, '}'))) {
*p = '\0'; *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 ? */ /* is this a bridging conference ? */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论