From 26087fc760efdd97f0aa4a674c5cf8de39f07067 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 19 May 2009 14:47:46 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@195451 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ead6e124ca..a0031cb0d9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23050,7 +23050,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc 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);