diff options
| author | Kinsey Moore <kmoore@digium.com> | 2011-09-12 14:24:03 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2011-09-12 14:24:03 +0000 |
| commit | 782cfdc7750608fa284d87c722bf40296fec6fb8 (patch) | |
| tree | 2ce222e464fa010e582c8e6c372e4bab7afac2f9 | |
| parent | 55b060fb357c1b9df65a8f6810c0640319bc2d89 (diff) | |
Merged revisions 335346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r335346 | kmoore | 2011-09-12 09:22:15 -0500 (Mon, 12 Sep 2011) | 17 lines
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/trunk@335354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_dial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index c92dec263..3867ebc76 100644 --- 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); } |