diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-12 23:55:50 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-12 23:55:50 +0000 |
| commit | af6dff8a0c9468ceb7859a7c08eaa544f808a633 (patch) | |
| tree | d718c1aeb5d014512d03050b89944fbac021ee58 /apps | |
| parent | 459b889c51ac4555ce6879eb8c256e216bbe02ac (diff) | |
Merged revisions 223832 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r223832 | jpeeler | 2009-10-12 18:48:09 -0500 (Mon, 12 Oct 2009) | 15 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@223835 f38db490-d61c-443f-a65b-d21fe96a405b
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 0cf934515..041a4e663 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -962,7 +962,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); + } break; case AST_CONTROL_VIDUPDATE: ast_verb(3, "%s requested a video update, passing it to %s\n", c->name, in->name); |