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

1 files changed, 2 insertions, 0 deletions

diff --git a/channel.c b/channel.c
index 57ca8fe16..539b3d9c1 100644
--- a/channel.c
+++ b/channel.c
@@ -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;