[asterisk-commits] tilghman: trunk r163089 - in /trunk: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Dec 11 10:52:24 2008
New Revision: 163089

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163089
Log:
Merged revisions 163088 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r163088 | tilghman | 2008-12-11 10:51:27 -0600 (Thu, 11 Dec 2008) | 6 lines
  
  Don't wait forever, if there's a specified recording timeout.
  (closes issue #13885)
   Reported by: bamby
   Patches: 
         res_agi.c.patch uploaded by bamby (license 430)
........

Modified:
    trunk/   (props changed)
    trunk/res/res_agi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_agi.c?view=diff&rev=163089&r1=163088&r2=163089
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Thu Dec 11 10:52:24 2008
@@ -1558,7 +1558,7 @@
 
 		start = ast_tvnow();
 		while ((ms < 0) || ast_tvdiff_ms(ast_tvnow(), start) < ms) {
-			res = ast_waitfor(chan, -1);
+			res = ast_waitfor(chan, ms - ast_tvdiff_ms(ast_tvnow(), start));
 			if (res < 0) {
 				ast_closestream(fs);
 				ast_agi_send(agi->fd, chan, "200 result=%d (waitfor) endpos=%ld\n", res,sample_offset);