[svn-commits] murf: branch 1.2 r48434 - /branches/1.2/channel.c

[svn-commits at lists.digium.com]

Author: murf
Date: Tue Dec 12 22:23:17 2006
New Revision: 48434

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48434
Log:
This small patch fixes bug 8541, where the L option to the Dial app wasn't working right. A similar bug (8386) was filed and fixed earlier, but an intervening bug fix to a DTMF problem broke the L() code in a different way. Hopefully, everything is happy now.

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?view=diff&rev=48434&r1=48433&r2=48434
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Tue Dec 12 22:23:17 2006
@@ -39,7 +39,7 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 #ifndef ZT_TIMERPING
-#error "You need newer zaptel!  Please cvs update zaptel"
+#error "You need newer zaptel!  Please svn update zaptel"
 #endif
 #endif
 
@@ -3351,7 +3351,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