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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 19e1148bcad4d464910fa34f6301bec6b883ba40..f901639b01d4ebed51095913fb86d13e94a0423d 100644 (file)
--- 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);