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

FS-4331 FS-4424 --resolve 2 for one sale

This commit is contained in:
Anthony Minessale 2012-07-19 17:39:12 -05:00
parent f50d14a7d1
commit 42f296de9b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -3510,7 +3510,7 @@ static switch_call_cause_t pickup_outgoing_channel(switch_core_session_t *sessio
tech_pvt = switch_core_session_alloc(nsession, sizeof(*tech_pvt));
tech_pvt->key = switch_core_session_strdup(nsession, pickup);
switch_event_dup(&tech_pvt->vars, var_event);
switch_core_session_set_private(nsession, tech_pvt);
@ -3534,7 +3534,9 @@ static switch_call_cause_t pickup_outgoing_channel(switch_core_session_t *sessio
pickup_add_session(nsession, pickup);
switch_channel_set_flag(nchannel, CF_PICKUP);
switch_channel_set_flag(nchannel, CF_NO_PRESENCE);
switch_event_dup(&tech_pvt->vars, var_event);
goto done;
error:

10
src/switch_ivr_originate.c
View File

@ -2580,6 +2580,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
local_clobber = switch_true(lc);
}
if (switch_channel_test_flag(originate_status[i].peer_channel, CF_NO_PRESENCE)) {
if (var_event) {
switch_event_del_header(var_event, "presence_id");
}
if (local_var_event) {
switch_event_del_header(local_var_event, "presence_id");
}
}
if (local_clobber) {
if (var_event) {
switch_event_header_t *header;