From: Jeff Peeler <jpeeler@digium.com>
Date: Mon, 12 Oct 2009 23:50:11 +0000 (+0000)
Subject: Merged revisions 223832 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0dad69187cde1fb22d7ae9d6829c8badc97f2f4;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@223833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 54082d5481..30a8bc5951 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -740,7 +740,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);