[asterisk-commits] file: branch 1.6.1 r195451 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue May 19 09:47:46 2009
New Revision: 195451

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195451
Log:
Merged revisions 195449 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195449 | file | 2009-05-19 11:43:54 -0300 (Tue, 19 May 2009) | 14 lines
  
  Merged revisions 195448 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r195448 | file | 2009-05-19 11:41:45 -0300 (Tue, 19 May 2009) | 7 lines
    
    Fix a bug where direct RTP setup would partially occur even when disabled if the calling channel was answered.
    
    (issue #13545)
    Reported by: davidw
    (issue #14244)
    Reported by: mbnwa
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=195451&r1=195450&r2=195451
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue May 19 09:47:46 2009
@@ -23050,7 +23050,7 @@
 		return -1;
 
 	/* Disable early RTP bridge  */
-	if (chan->_state != AST_STATE_UP && !global_directrtpsetup) 	/* We are in early state */
+	if (!ast_bridged_channel(chan) && !global_directrtpsetup) 	/* We are in early state */
 		return 0;
 
 	sip_pvt_lock(p);