[asterisk-commits] kmoore: trunk r335354 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Sep 12 09:24:03 2011
New Revision: 335354

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

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-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=335354&r1=335353&r2=335354
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Mon Sep 12 09:24:03 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);
 					}