From: Joshua Colp <jcolp@digium.com>
Date: Mon, 4 Dec 2006 18:14:46 +0000 (+0000)
Subject: If the generic bridge tells us not to retry, and we have a frame to spit out then... 
X-Git-Tag: 1.2.14~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6502bf97af37a0d37d046b4a21f4088f13c5fc26;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.2@48233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channel.c b/channel.c
index 57ca8fe162..539b3d9c16 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;