[svn-commits] file: trunk r45052 - in /trunk: ./ apps/app_playback.c

[svn-commits at lists.digium.com]

Author: file
Date: Fri Oct 13 11:22:17 2006
New Revision: 45052

URL: http://svn.digium.com/view/asterisk?rev=45052&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_playback.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_playback.c?rev=45052&r1=45051&r2=45052&view=diff
==============================================================================
--- trunk/apps/app_playback.c (original)
+++ trunk/apps/app_playback.c Fri Oct 13 11:22:17 2006
@@ -155,6 +155,9 @@
 	ast_log(LOG_WARNING, "string <%s> depth <%d>\n", s, 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;
 	}
 
@@ -253,11 +256,6 @@
         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);
 }