automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8641 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index ff5390c95b9722091da76faced1230a8ccdb63a1..8f33914244b518549c56238711683d6f66a2369c 100644 (file)
--- 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");