diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 21:36:17 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 21:36:17 +0000 |
commit | 6647ea571902e073bf7b1944aa0f6d8df88dd89b (patch) | |
tree | 1bdb82715de49942df368bba99b33d9a57a4d369 /channel.c | |
parent | 84cc5e8bd05435b7e181b4685f1d13cb74c81d7e (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@37223 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |