[asterisk-commits] file: trunk r53400 - in /trunk: ./ apps/app_playback.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Feb  7 11:06:34 2007
New Revision: 53400

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53400
Log:
Merged revisions 53399 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53399 | file | 2007-02-07 12:04:44 -0500 (Wed, 07 Feb 2007) | 2 lines

Directly load say.conf in load_module instead of calling the reload function. (issue #8946 reported by junky)

........

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?view=diff&rev=53400&r1=53399&r2=53400
==============================================================================
--- trunk/apps/app_playback.c (original)
+++ trunk/apps/app_playback.c Wed Feb  7 11:06:34 2007
@@ -480,7 +480,7 @@
 
 static int load_module(void)
 {
-	reload();
+	say_cfg = ast_config_load("say.conf");
         ast_cli_register_multiple(cli_playback, sizeof(cli_playback) / sizeof(struct ast_cli_entry));
 	return ast_register_application(app, playback_exec, synopsis, descrip);
 }