[asterisk-commits] rmudgett: trunk r314079 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Apr 18 11:25:06 2011
New Revision: 314079

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314079
Log:
Merged revisions 314068 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r314068 | rmudgett | 2011-04-18 11:02:12 -0500 (Mon, 18 Apr 2011) | 7 lines
  
  Unclear code in app_dial.c.
  
  Make code formatting clear.
  
  (closes issue #19134)
  Reported by: oej
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=314079&r1=314078&r2=314079
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Mon Apr 18 11:25:06 2011
@@ -1244,14 +1244,17 @@
 					/* Setup early media if appropriate */
 					if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
 						ast_channel_early_bridge(in, c);
-					if (!ast_test_flag64(outgoing, OPT_RINGBACK))
+					if (!ast_test_flag64(outgoing, OPT_RINGBACK)) {
 						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);
-						}
+					}
+					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);
+					}
 					break;
 				case AST_CONTROL_VIDUPDATE:
 					ast_verb(3, "%s requested a video update, passing it to %s\n", c->name, in->name);