[svn-commits] file: trunk r57054 - in /trunk: ./ apps/app_speech_utils.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Feb 28 11:47:41 2007
New Revision: 57054

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57054
Log:
Merged revisions 57053 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57053 | file | 2007-02-28 12:45:50 -0500 (Wed, 28 Feb 2007) | 2 lines

Better handle timeouts when the individual speaks after everything has been played but before the timeout ends.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_speech_utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_speech_utils.c?view=diff&rev=57054&r1=57053&r2=57054
==============================================================================
--- trunk/apps/app_speech_utils.c (original)
+++ trunk/apps/app_speech_utils.c Wed Feb 28 11:47:41 2007
@@ -587,7 +587,7 @@
                 }
 
 		/* Do timeout check (shared between audio/dtmf) */
-		if (started == 1) {
+		if (!quieted && started == 1) {
 			time(&current);
 			if ((current-start) >= timeout) {
 				done = 1;
@@ -599,8 +599,9 @@
 
                 /* Do checks on speech structure to see if it's changed */
                 ast_mutex_lock(&speech->lock);
-                if (ast_test_flag(speech, AST_SPEECH_QUIET) && chan->stream != NULL) {
-                        ast_stopstream(chan);
+                if (ast_test_flag(speech, AST_SPEECH_QUIET)) {
+			if (chan->stream)
+				ast_stopstream(chan);
 			ast_clear_flag(speech, AST_SPEECH_QUIET);
 			quieted = 1;
                 }