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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57054 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index a2c53a550b04011b624fa4e645c81cd769a4a1fc..23de1cdad8481d0c5ff468421a5dac96016b3221 100644 (file)
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -587,7 +587,7 @@ static int speech_background(struct ast_channel *chan, void *data)
                 }
 
                /* 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 @@ static int speech_background(struct ast_channel *chan, void *data)
 
                 /* 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;
                 }