From cf86ee84cabc059434f71d2c8b1cff12328ba069 Mon Sep 17 00:00:00 2001 From: Matt O'Gorman Date: Thu, 6 Jul 2006 21:36:17 +0000 Subject: patch resolves issue with when to decide if its right time to native bridge, feature redirect was not being checked. patch from bug #7296 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37223 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channel.c b/channel.c index 86eae160b..e431bd112 100644 --- a/channel.c +++ b/channel.c @@ -3593,7 +3593,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha (config->timelimit == 0) && (c0->tech->bridge == c1->tech->bridge) && !nativefailed && !c0->monitor && !c1->monitor && - !c0->spies && !c1->spies) { + !c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) && + !ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) { /* Looks like they share a bridge method and nothing else is in the way */ ast_set_flag(c0, AST_FLAG_NBRIDGE); ast_set_flag(c1, AST_FLAG_NBRIDGE); -- cgit v1.2.3