[asterisk-commits] jpeeler: trunk r250979 - /trunk/apps/app_followme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Mar  5 13:10:47 2010
New Revision: 250979

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

Modified:
    trunk/apps/app_followme.c

Modified: trunk/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_followme.c?view=diff&rev=250979&r1=250978&r2=250979
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Fri Mar  5 13:10:47 2010
@@ -360,7 +360,7 @@
 	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));
 	}
 
 
@@ -371,21 +371,21 @@
 	}
 
 	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 */