diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-16 21:46:26 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-16 21:46:26 +0000 |
| commit | c0019b6b22bf354e1352768c04cfdfd4dc797f75 (patch) | |
| tree | 47d89f8d24d39efc5977ff96134a17a3059ca87e /funcs | |
| parent | 5bb304e8e6ff3ab1903e637f7b120ab7ea6455a9 (diff) | |
Merged revisions 206877 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r206877 | dvossel | 2009-07-16 16:45:14 -0500 (Thu, 16 Jul 2009) | 6 lines
TIMEOUT(absolute) returned negative value.
(closes issue #15513)
Reported by: ys
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@206879 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 1640334fc..c54830358 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -54,7 +54,7 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data, ast_copy_string(buf, "0", len); } else { myt = ast_tvnow(); - snprintf(buf, len, "%.3f", ast_tvdiff_ms(myt, chan->whentohangup) / 1000.0); + snprintf(buf, len, "%.3f", ast_tvdiff_ms(chan->whentohangup, myt) / 1000.0); } break; |