[svn-commits] kmoore: branch 1.8 r335341 - /branches/1.8/apps/app_dial.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Sep 12 09:21:17 2011
New Revision: 335341

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335341
Log:
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)

Modified:
    branches/1.8/apps/app_dial.c

Modified: branches/1.8/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_dial.c?view=diff&rev=335341&r1=335340&r2=335341
==============================================================================
--- branches/1.8/apps/app_dial.c (original)
+++ branches/1.8/apps/app_dial.c Mon Sep 12 09:21:17 2011
@@ -1351,7 +1351,7 @@
 				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);
 					}