From: Olle Johansson <oej@edvina.net>
Date: Wed, 25 Jan 2006 09:50:28 +0000 (+0000)
Subject: Issue #6349 - patch by markster, imported from 1.2
X-Git-Tag: 1.4.0-beta1~2795
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d99282f9f579900b5991608f6aa3bd3b98b0d83;p=thirdparty%2Fasterisk.git

Issue #6349 - patch by markster, imported from 1.2


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channel.c b/channel.c
index 19f2a81fac..8a052852bb 100644
--- a/channel.c
+++ b/channel.c
@@ -3298,11 +3298,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");