[Asterisk-cvs] asterisk/apps app_dial.c,1.139,1.140

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv4008/apps

Modified Files:
	app_dial.c 
Log Message:
Copy/paste errors (bug #3559, #3560)


Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- app_dial.c	9 Feb 2005 22:59:46 -0000	1.139
+++ app_dial.c	11 Feb 2005 06:53:18 -0000	1.140
@@ -819,19 +819,19 @@
 			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("))) {