projects
/
asterisk/asterisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "app_dial.c: Force COLP update if outgoing channel name changed."
[asterisk/asterisk.git]
/
apps
/
app_dial.c
diff --git
a/apps/app_dial.c
b/apps/app_dial.c
index
6461c40
..
f3f5276
100644
(file)
--- a/
apps/app_dial.c
+++ b/
apps/app_dial.c
@@
-2724,7
+2724,7
@@
static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
chans[0] = chan;
chans[1] = peer;
chans[0] = chan;
chans[1] = peer;
- /* we need to stream the announcment while monitoring the caller for a hangup */
+ /* we need to stream the announcement while monitoring the caller for a hangup */
/* stream the file */
res = ast_streamfile(peer, opt_args[OPT_ARG_ANNOUNCE], ast_channel_language(peer));
/* stream the file */
res = ast_streamfile(peer, opt_args[OPT_ARG_ANNOUNCE], ast_channel_language(peer));
@@
-2803,7
+2803,6
@@
static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
if (ast_pbx_start(peer)) {
ast_autoservice_chan_hangup_peer(chan, peer);
}
if (ast_pbx_start(peer)) {
ast_autoservice_chan_hangup_peer(chan, peer);
}
- hanguptree(&out_chans, NULL, ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0);
if (continue_exec)
*continue_exec = 1;
res = 0;
if (continue_exec)
*continue_exec = 1;
res = 0;