From: Joshua Colp <jcolp@digium.com>
Date: Fri, 13 Oct 2006 16:22:17 +0000 (+0000)
Subject: Merged revisions 45051 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc1f0f26788029d99ffa999b06b70824243a113;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@45052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

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);
 }