From d9cb23cc90bced1c61eac86071b810f6a608a174 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Mon, 8 Aug 2005 06:54:36 +0000
Subject: [PATCH] Don't wait longer than our timeout for something to happen
 (bug #4653)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channel.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/channel.c b/channel.c
index eebcd517d1..ee076ee3b1 100755
--- a/channel.c
+++ b/channel.c
@@ -2879,7 +2879,7 @@ static int ast_generic_bridge(int *playitagain, int *playit, struct ast_channel
 	/* Copy voice back and forth between the two channels.	Give the peer
 	   the ability to transfer calls with '#<extension' syntax. */
 	struct ast_channel *cs[3];
-	int to = -1;
+	int to;
 	struct ast_frame *f;
 	struct ast_channel *who = NULL;
 	void *pvt0, *pvt1;
@@ -2922,8 +2922,10 @@ static int ast_generic_bridge(int *playitagain, int *playit, struct ast_channel
 				res = -3;
 				break;
 			}
-			
-		}
+			to = time_left_ms;
+		} else	
+			to = -1;
+
 
 		who = ast_waitfor_n(cs, 2, &to);
 		if (!who) {