[asterisk-commits] branch crichter/0.3.0 - r8635 in /team/crichter/0.3.0: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Wed Jan 25 03:58:37 2006
New Revision: 8635

URL: http://svn.digium.com/view/asterisk?rev=8635&view=rev
Log:
Merged revisions 8632 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8632 | oej | 2006-01-25 10:46:43 +0100 (Mi, 25 Jan 2006) | 2 lines

Issue #6439 - the "timebomb" bug. Patch by Markster over GPRS

........

Modified:
    team/crichter/0.3.0/   (props changed)
    team/crichter/0.3.0/channel.c

Propchange: team/crichter/0.3.0/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 25 03:58:37 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-8620
+/branches/1.2:1-8634

Modified: team/crichter/0.3.0/channel.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channel.c?rev=8635&r1=8634&r2=8635&view=diff
==============================================================================
--- team/crichter/0.3.0/channel.c (original)
+++ team/crichter/0.3.0/channel.c Wed Jan 25 03:58:37 2006
@@ -3235,11 +3235,14 @@
 			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");