[svn-commits] dvossel: branch 1.6.1 r206879 - in /branches/1.6.1: ./ funcs/func_timeout.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Jul 16 16:46:26 2009
New Revision: 206879

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206879
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_timeout.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_timeout.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/funcs/func_timeout.c?view=diff&rev=206879&r1=206878&r2=206879
==============================================================================
--- branches/1.6.1/funcs/func_timeout.c (original)
+++ branches/1.6.1/funcs/func_timeout.c Thu Jul 16 16:46:26 2009
@@ -54,7 +54,7 @@
 			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;