mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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/trunk@250979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -360,7 +360,7 @@ static int reload_followme(int reload)
|
|||||||
if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt")) && !ast_strlen_zero(tmpstr)) {
|
if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt")) && !ast_strlen_zero(tmpstr)) {
|
||||||
ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
|
ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
|
||||||
} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording_prompt")) && !ast_strlen_zero(tmpstr)) {
|
} 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -371,21 +371,21 @@ static int reload_followme(int reload)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls-hold-prompt")) && !ast_strlen_zero(tmpstr)) {
|
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)) {
|
} 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)) {
|
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)) {
|
} 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)) {
|
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)) {
|
} 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 */
|
/* Chug through config file */
|
||||||
|
Reference in New Issue
Block a user