[asterisk-commits] file: branch 1.2 r48233 - /branches/1.2/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Dec  4 12:14:46 2006
New Revision: 48233

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48233
Log:
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.

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?view=diff&rev=48233&r1=48232&r2=48233
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Mon Dec  4 12:14:46 2006
@@ -3648,6 +3648,8 @@
 			o1nativeformats = c1->nativeformats;
 		}
 		res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts);
+		if (res != AST_BRIDGE_RETRY && fo)
+			break;
 	}
 
 	c0->_bridge = NULL;