From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 7 Jun 2007 23:17:01 +0000 (+0000)
Subject: Merged revisions 68354 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1093e635535984c2c3a13db71438043aa16ac8e3;p=thirdparty%2Fasterisk.git

Merged revisions 68354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r68354 | russell | 2007-06-07 18:14:45 -0500 (Thu, 07 Jun 2007) | 11 lines

Merged revisions 68351 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68351 | russell | 2007-06-07 18:13:33 -0500 (Thu, 07 Jun 2007) | 3 lines

Fix a problem where saying a character wouldn't properly break out when the caller pressed '#'
(issue #8113, reported by patbaker82, patch from jamesgolovich (hey, long time no see!) and patbaker82)

........

................


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

diff --git a/main/say.c b/main/say.c
index 92fec372e7..fdc142d5f4 100644
--- a/main/say.c
+++ b/main/say.c
@@ -67,7 +67,7 @@ static int say_character_str_full(struct ast_channel *chan, const char *str, con
 	int num = 0;
 	int res = 0;
 
-	while (str[num]) {
+	while (str[num] && !res) {
 		fn = NULL;
 		switch (str[num]) {
 		case ('*'):
@@ -142,7 +142,7 @@ static int say_phonetic_str_full(struct ast_channel *chan, const char *str, cons
 	int num = 0;
 	int res = 0;
 
-	while (str[num]) {
+	while (str[num] && !res) {
 		fn = NULL;
 		switch (str[num]) {
 		case ('*'):