Merged revisions 335341 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r335341 | kmoore | 2011-09-12 09:21:17 -0500 (Mon, 12 Sep 2011) | 10 lines

  Ensure frames are not written to dialed channel if ringback is requested

  When a single channel was dialed and there was media to be forwarded to the
  calling channel, the media was written without regard for ringback causing
  silence to be heard in some circumstances.  This regression was introduced
  when the meaning of "single" changed to mean only the number of channels
  dialed.

  (closes issue ASTERISK-18083)
........

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index c92dec2639e585a2f3f52c598c15202e1422a31a..3867ebc76a6fcda45473b50d53bb5978184aa8cd 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1351,7 +1351,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                case AST_FRAME_VOICE:
                                case AST_FRAME_IMAGE:
                                case AST_FRAME_TEXT:
-                                       if (ast_write(in, f)) {
+                                       if (!ast_test_flag64(outgoing, OPT_RINGBACK | OPT_MUSICBACK) && ast_write(in, f)) {
                                                ast_log(LOG_WARNING, "Unable to write frametype: %d\n",
                                                        f->frametype);
                                        }