[svn-commits] file: branch 1.6.1 r161789 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Dec  8 12:49:47 2008
New Revision: 161789

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161789
Log:
Merged revisions 161787 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161787 | file | 2008-12-08 14:47:32 -0400 (Mon, 08 Dec 2008) | 6 lines
  
  Fix a regression introduced when the PBX timeouts were converted to milliseconds. collect_digits now gets milliseconds fed to it, not seconds.
  (closes issue #14012)
  Reported by: dveiga
  Patches:
        14012.patch uploaded by bkruse (license 132)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

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

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=161789&r1=161788&r2=161789
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Mon Dec  8 12:49:47 2008
@@ -3647,7 +3647,7 @@
 	while (ast_matchmore_extension(c, c->context, buf, 1, c->cid.cid_num)) {
 		/* As long as we're willing to wait, and as long as it's not defined,
 		   keep reading digits until we can't possibly get a right answer anymore.  */
-		digit = ast_waitfordigit(c, waittime * 1000);
+		digit = ast_waitfordigit(c, waittime);
 		if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) {
 			c->_softhangup = 0;
 		} else {