[svn-commits] file: branch 1.4 r47707 - /branches/1.4/main/channel.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Nov 15 15:33:41 2006
New Revision: 47707

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47707
Log:
We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK)

Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/channel.c?view=diff&rev=47707&r1=47706&r2=47707
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Wed Nov 15 15:33:41 2006
@@ -3648,7 +3648,10 @@
 		if (bridge_end.tv_sec) {
 			to = ast_tvdiff_ms(bridge_end, ast_tvnow());
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
+				if (config->timelimit)
+					res = AST_BRIDGE_RETRY;
+				else
+					res = AST_BRIDGE_COMPLETE;
 				break;
 			}
 		} else
@@ -3828,8 +3831,11 @@
 			now = ast_tvnow();
 			to = ast_tvdiff_ms(nexteventts, now);
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
-				break;
+				if (!config->timelimit) {
+					res = AST_BRIDGE_COMPLETE;
+					break;
+				}
+				to = 0;
 			}
 		}