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

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3646 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-12-14 02:35:39 +00:00
parent 6a25dae421
commit 9aab10e820
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -863,7 +863,7 @@ static void conference_loop(conference_member_t *member)
if (switch_channel_test_flag(channel, CF_OUTBOUND)) { if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
/* test to see if outbound channel has answered */ /* test to see if outbound channel has answered */
if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n");
switch_set_flag(member->conference, CFLAG_ANSWERED); switch_set_flag(member->conference, CFLAG_ANSWERED);
} }
} else { } else {
@ -2577,7 +2577,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference,
goto done; goto done;
} }
/* add them to the conference */ /* add them to the conference */
if (flags) { if (flags && strcasecmp(flags, "none")) {
snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags);
switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata);
} else { } else {