Merged revisions 59963 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59963 | file | 2007-04-03 15:40:59 -0400 (Tue, 03 Apr 2007) | 2 lines

Don't clash when a person both speaks and uses DTMF.

........

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

diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index b430a4094edab267188713d1f86c8526bce1b610..cf8964ebd2a5dccc6bd666b3e3760b50f1bce39e 100644 (file)
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -590,7 +590,7 @@ static int speech_background(struct ast_channel *chan, void *data)
                 }
 
                /* Do timeout check (shared between audio/dtmf) */
-               if (!quieted && started == 1) {
+               if ((!quieted || strlen(dtmf)) && started == 1) {
                        time(&current);
                        if ((current-start) >= timeout) {
                                done = 1;
@@ -677,11 +677,13 @@ static int speech_background(struct ast_channel *chan, void *data)
                                } else {
                                        if (chan->stream != NULL) {
                                                ast_stopstream(chan);
+                                       }
+                                       if (!started) {
                                                /* Change timeout to be 5 seconds for DTMF input */
                                                timeout = (chan->pbx && chan->pbx->dtimeout) ? chan->pbx->dtimeout : 5;
-                                               time(&start);
                                                started = 1;
                                        }
+                                       time(&start);
                                        snprintf(tmp, sizeof(tmp), "%c", f->subclass);
                                        strncat(dtmf, tmp, sizeof(dtmf));
                                }