From: Joshua Colp <jcolp@digium.com>
Date: Tue, 19 May 2009 14:43:54 +0000 (+0000)
Subject: Merged revisions 195448 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4858
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99a1e0ce01d0c60702136f617f92c795b3c91af6;p=thirdparty%2Fasterisk.git

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
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fd30dfd943..44f3dbbc54 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -24775,7 +24775,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
                 return -1;
 
 	/* Disable early RTP bridge  */
-	if (chan->_state != AST_STATE_UP && !sip_cfg.directrtpsetup) 	/* We are in early state */
+	if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) 	/* We are in early state */
 		return 0;
 
         sip_pvt_lock(p);