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

[svn-commits at lists.digium.com]

Author: file
Date: Tue Apr  3 14:43:26 2007
New Revision: 59969

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59969
Log:
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.

........

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=59969&r1=59968&r2=59969
==============================================================================
--- trunk/apps/app_speech_utils.c (original)
+++ trunk/apps/app_speech_utils.c Tue Apr  3 14:43:26 2007
@@ -590,7 +590,7 @@
                 }
 
 		/* 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 @@
 				} 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));
 				}