diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 16:54:04 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 16:54:04 +0000 |
| commit | 8d01b235a0a4f3eface054e69d0a2ef455d4ef3d (patch) | |
| tree | 984ca830d2148878720bdbfb9f362c851e85faf1 /res/res_agi.c | |
| parent | 19ddc0958abba156b4e3f0d2df08af59e3bbacb3 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@163091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_agi.c')
| -rw-r--r-- | res/res_agi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index a6eefe8ce..d9a74fcfb 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1316,7 +1316,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); |