[svn-commits] jpeeler: branch 1.6.1 r237325 - in /branches/1.6.1: ./ res/res_agi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Jan  4 10:26:49 2010
New Revision: 237325

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

........
  r237323 | jpeeler | 2010-01-04 10:24:51 -0600 (Mon, 04 Jan 2010) | 5 lines
  
  Fix timeout for AGI command speech recognize.
  
  (closes issue #16297)
  Reported by: semond
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_agi.c

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

Modified: branches/1.6.1/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=237325&r1=237324&r2=237325
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Mon Jan  4 10:26:49 2010
@@ -1955,7 +1955,7 @@
 		switch (speech->state) {
 		case AST_SPEECH_STATE_READY:
 			/* If the stream is done, start timeout calculation */
-			if ((timeout > 0) && ((!chan->stream) || (chan->streamid == -1 && chan->timingfunc == NULL))) {
+			if ((timeout > 0) && start == 0 && ((!chan->stream) || (chan->streamid == -1 && chan->timingfunc == NULL))) {
 				ast_stopstream(chan);
 				time(&start);
 			}