If the generic bridge tells us not to retry, and we have a frame to spit out then...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48233 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index 57ca8fe16299b18506bd80c4929608ac73300db6..539b3d9c163aa3fd050662f79c49847a795092df 100644 (file)
--- 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;