From a07938ea7ea304e7fa1f88cc7ef67c73fa39d35d Mon Sep 17 00:00:00 2001 From: Automerge script Date: Thu, 6 Jul 2006 22:04:42 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37253 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channel.c b/channel.c index 3aa88130d5..1f5f596052 100644 --- a/channel.c +++ b/channel.c @@ -3483,7 +3483,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 */ if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name); -- 2.47.2