]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Properly load say.conf upon reload of module app_playback.
authorKevin Harwell <kharwell@digium.com>
Mon, 11 Feb 2013 21:17:04 +0000 (21:17 +0000)
committerKevin Harwell <kharwell@digium.com>
Mon, 11 Feb 2013 21:17:04 +0000 (21:17 +0000)
If say.conf did not exists prior to originally loading module app_playback it
would not load on subsequent reloads of the module once it had been created.
This occurred because upon reload of the app_playback module it would only
load a new configuration if an old one had previously existed.  This fix simply
removed the association between checking if an old configuration existed and
the loading of the new one.

(closes issue ASTERISK-20800)
Reported by: pgoergler
........

Merged revisions 381216 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 381217 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381219 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_playback.c

index 12b1ff6981fb99f8e33a3860164146d0c1e48675..148657d8df801adebf82b040f3142b18310c5e9b 100644 (file)
@@ -513,8 +513,8 @@ static int reload(void)
        if (say_cfg) {
                ast_config_destroy(say_cfg);
                ast_log(LOG_NOTICE, "Reloading say.conf\n");
-               say_cfg = newcfg;
        }
+       say_cfg = newcfg;
 
        if (say_cfg) {
                for (v = ast_variable_browse(say_cfg, "general"); v ; v = v->next) {