[asterisk-commits] trunk - r8633 in /trunk: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Jan 25 03:50:28 2006
New Revision: 8633

URL: http://svn.digium.com/view/asterisk?rev=8633&view=rev
Log:
Issue #6349 - patch by markster, imported from 1.2

Modified:
    trunk/   (props changed)
    trunk/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=8633&r1=8632&r2=8633&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Wed Jan 25 03:50:28 2006
@@ -3298,11 +3298,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");