diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-10-12 23:48:09 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-10-12 23:48:09 +0000 |
| commit | 832be82dfbe2027717c12d6aa93f4f310c1879f0 (patch) | |
| tree | 74fe9630a55e6a9419d440e88dea5f0711b2a0c9 /apps | |
| parent | b14857f49de5b6631c318fb90ce2708358d2d938 (diff) | |
Merged revisions 223804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r223804 | jpeeler | 2009-10-12 18:12:50 -0500 (Mon, 12 Oct 2009) | 8 lines
Ensure ringing continues for branched calls after progress is received
While waiting for an answer, don't send progress for branched calls
for which ringing was sent.
(closes issue #15028)
Reported by: fnordian
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@223832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 19e1148bc..f901639b0 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1068,7 +1068,9 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, if (single && CAN_EARLY_BRIDGE(peerflags, in, c)) ast_channel_early_bridge(in, c); if (!ast_test_flag64(outgoing, OPT_RINGBACK)) - ast_indicate(in, AST_CONTROL_PROGRESS); + if (single || (!single && !pa->sentringing)) { + ast_indicate(in, AST_CONTROL_PROGRESS); + } if(!ast_strlen_zero(dtmf_progress)) { ast_verb(3, "Sending DTMF '%s' to the called party as result of receiving a PROGRESS message.\n", dtmf_progress); ast_dtmf_stream(c, in, dtmf_progress, 250, 0); |