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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@206879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 1640334fc6a017a19231ac7e62a98dcabe83100e..c54830358536c2f0fd7760dbd9411609ba3e4f49 100644 (file)
--- 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;