From c1f12bd5ad4703fe61aff77e08a1f84b7d9083e5 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 13 Oct 2006 16:20:58 +0000 Subject: [PATCH] Move say.conf existence check to do_say function since it is called from multiple places (issue #8144 reported by kshumard) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45051 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_playback.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/app_playback.c b/apps/app_playback.c index 5dfb589f71..c88d22e741 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); }