Merged revisions 250979 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r250979 | jpeeler | 2010-03-05 13:10:47 -0600 (Fri, 05 Mar 2010) | 9 lines

  Fix app_followme playing wrong sound files.

  Fixes regression introduced in 140167 that uses the wrong variable names.

  (closes issue #16930)
  Reported by: ianc
  Patches:
        fix_reload_followme.diff uploaded by ianc (license 998)
........

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

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 934aeb505092a1bf3e7e38f4399714cfb3d45012..b1d708b138774e12bdbe12554a9331166e7aad18 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -354,7 +354,7 @@ static int reload_followme(int reload)
        if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt")) && !ast_strlen_zero(tmpstr)) {
                ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
        } else if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording_prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(callfromprompt, tmpstr, sizeof(callfromprompt));
+               ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
        }
 
 
@@ -365,21 +365,21 @@ static int reload_followme(int reload)
        }
 
        if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls-hold-prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
        } else if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls_hold_prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
        }
 
        if ((tmpstr = ast_variable_retrieve(cfg, "general", "status-prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
        } else if ((tmpstr = ast_variable_retrieve(cfg, "general", "status_prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
        }
 
        if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry-prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
        } else if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry_prompt")) && !ast_strlen_zero(tmpstr)) {
-               ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+               ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
        }
 
        /* Chug through config file */