From c9d6041a8bca8b0230746c79628591fe799bd555 Mon Sep 17 00:00:00 2001
From: Brett Bryant <bbryant@digium.com>
Date: Mon, 12 May 2008 15:18:10 +0000
Subject: [PATCH] Merged revisions 115669 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r115669 | bbryant | 2008-05-12 10:17:32 -0500 (Mon, 12 May 2008) | 3 lines

A small change to fix iax2 native bridging.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_iax2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 22af598bb8..abdad2da67 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3759,8 +3759,11 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
 	struct timeval waittimer = {0, 0}, tv;
 
 	/* We currently do not support native bridging if a timeoutms value has been provided */
-	if (timeoutms)
+	if (timeoutms > 0) {
 		return AST_BRIDGE_FAILED;
+	}
+
+	timeoutms = 0;
 
 	lock_both(callno0, callno1);
 	if (!iaxs[callno0] || !iaxs[callno1]) {