summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-06-07 23:17:01 +0000
committerRussell Bryant <russell@russellbryant.com>2007-06-07 23:17:01 +0000
commit1093e635535984c2c3a13db71438043aa16ac8e3 (patch)
tree2ea3b9e693b8529ef6eadc02c037a119c27a21ad /main
parent1d57ccb6f70f41fb1a50fa9546b8a380bc234d5c (diff)
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
Diffstat (limited to 'main')
-rw-r--r--main/say.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/say.c b/main/say.c
index 92fec372e..fdc142d5f 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 ('*'):