aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-16 21:45:47 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-16 21:45:47 +0000
commit5b40175b4201615723cb63f0216d568917e668b6 (patch)
treec5942ab5fb44077c49efb167e3da5fa5777d04cb /funcs
parent3e8cdee1cf35ad56f2952d7928ff7ecc953f2c03 (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.2@206878 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_timeout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 2b3a000b4..65fc6ce5c 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -90,7 +90,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;