diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-04 18:14:46 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-04 18:14:46 +0000 |
commit | 5e797c326e7e20103230955f96d7fffb88c245a4 (patch) | |
tree | 6a5f48c54b566ec1f54f8533a715ce6d405260a7 /channel.c | |
parent | ba64a955081bb62acde697c61204c455e457a6a3 (diff) |
If the generic bridge tells us not to retry, and we have a frame to spit out then break the bridge. Props to markit in #asterisk-bugs for bringing this up.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@48233 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3648,6 +3648,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha o1nativeformats = c1->nativeformats; } res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts); + if (res != AST_BRIDGE_RETRY && fo) + break; } c0->_bridge = NULL; |