diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 16:22:17 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 16:22:17 +0000 |
commit | 3c232b90497da46c52c6e5adc23bc74fb32c59ea (patch) | |
tree | b56b08ee77b119d94ca011a464931fa1055f6574 /apps/app_playback.c | |
parent | 358e9d25228b1b825dccf0ac71c32b83cb177aa1 (diff) |
Merged revisions 45051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45051 | file | 2006-10-13 12:20:58 -0400 (Fri, 13 Oct 2006) | 2 lines
Move say.conf existence check to do_say function since it is called from multiple places (issue #8144 reported by kshumard)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_playback.c')
-rw-r--r-- | apps/app_playback.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/app_playback.c b/apps/app_playback.c index 5dfb589f7..c88d22e74 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -156,6 +156,9 @@ static int do_say(say_args_t *a, const char *s, const char *options, int depth) if (depth++ > 10) { ast_log(LOG_WARNING, "recursion too deep, exiting\n"); return -1; + } else if (!say_cfg) { + ast_log(LOG_WARNING, "no say.conf, cannot spell '%s'\n", s); + return -1; } /* scan languages same as in file.c */ @@ -253,11 +256,6 @@ static int say_full(struct ast_channel *chan, const char *string, int audiofd, int ctrlfd) { say_args_t a = { chan, ints, lang, audiofd, ctrlfd }; - - if (!say_cfg) { - ast_log(LOG_WARNING, "no say.conf, cannot spell '%s'\n", string); - return -1; - } return do_say(&a, string, options, 0); } |