From 1ac2518c09db7a10d2810e8825d6561a64ffa890 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 11 Dec 2008 16:53:12 +0000 Subject: [PATCH] Merged revisions 163089 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r163089 | tilghman | 2008-12-11 10:52:24 -0600 (Thu, 11 Dec 2008) | 13 lines 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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@163090 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_agi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/res_agi.c b/res/res_agi.c index e656ff3f92..ae6c3196d2 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1334,7 +1334,7 @@ static int handle_recordfile(struct ast_channel *chan, AGI *agi, int argc, char 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);