aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-02-11 06:53:18 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-02-11 06:53:18 +0000
commitd83fd65a73bdf588e489e0d023fcd725f93bb15f (patch)
tree2e58e561ab914f08fa9456cfe72ccc48703a1961 /apps
parent00c778824d474f7f1d4019df6a8919d053673e9d (diff)
Copy/paste errors (bug #3559, #3560)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_dial.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index afd3535d4..da8888d5f 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -819,19 +819,19 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
mac++; /* Leave the "m" in the string */
while (*mac && (*mac != ')'))
*(mac++) = 'X';
- if (*mac)
+ if (*mac) {
*mac = 'X';
- else {
+ mac = strchr(mohclass, ')');
+ if (mac)
+ *mac = '\0';
+ else {
+ ast_log(LOG_WARNING, "Music on hold class specified without trailing ')'\n");
+ mohclass = NULL;
+ }
+ } else {
ast_log(LOG_WARNING, "Could not find music on hold class to use, assuming default.\n");
mohclass=NULL;
}
- mac = strchr(macroname, ')');
- if (mac)
- *mac = '\0';
- else {
- ast_log(LOG_WARNING, "Music on hold class specified without trailing ')'\n");
- mohclass = NULL;
- }
}
/* Extract privacy info from transfer */
if ((s = strstr(transfer, "P("))) {