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.1@223834 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

@@ -750,7 +750,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);