Merged revisions 314068 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Mon, 18 Apr 2011 16:25:06 +0000 (16:25 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 18 Apr 2011 16:25:06 +0000 (16:25 +0000)
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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

index a66225a..a8a3ff9 100644 (file)
@@ -1244,14 +1244,17 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                        /* 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);