automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8641 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 8 insertions, 5 deletions

diff --git a/channel.c b/channel.c
index ff5390c95..8f3391424 100644
--- a/channel.c
+++ b/channel.c
@@ -3235,11 +3235,14 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
 			res = AST_BRIDGE_RETRY;
 			break;
 		}
-		to = ast_tvdiff_ms(bridge_end, ast_tvnow());
-		if (to <= 0) {
-			res = AST_BRIDGE_RETRY;
-			break;
-		}
+		if (bridge_end.tv_sec) {
+			to = ast_tvdiff_ms(bridge_end, ast_tvnow());
+			if (to <= 0) {
+				res = AST_BRIDGE_RETRY;
+				break;
+			}
+		} else
+			to = -1;
 		who = ast_waitfor_n(cs, 2, &to);
 		if (!who) {
 			ast_log(LOG_DEBUG, "Nobody there, continuing...\n");