[asterisk-commits] mmichelson: trunk r266092 - in /trunk: main/channel.c res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 26 15:04:51 2010
New Revision: 266092

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266092
Log:
Fix misspelling of macro args.


Modified:
    trunk/main/channel.c
    trunk/res/res_musiconhold.c

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=266092&r1=266091&r2=266092
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed May 26 15:04:51 2010
@@ -7882,7 +7882,7 @@
 		? "CONNECTED_LINE_CALLER_SEND_MACRO" : "CONNECTED_LINE_CALLEE_SEND_MACRO");
 	macro = ast_strdupa(S_OR(macro, ""));
 	macro_args = pbx_builtin_getvar_helper(macro_chan, is_caller
-		? "CONNECTED_LINE_CALLER_SEND_MACRO_ARSG" : "CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS");
+		? "CONNECTED_LINE_CALLER_SEND_MACRO_ARGS" : "CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS");
 	macro_args = ast_strdupa(S_OR(macro_args, ""));
 	ast_channel_unlock(macro_chan);
 

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=266092&r1=266091&r2=266092
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed May 26 15:04:51 2010
@@ -1443,6 +1443,10 @@
 		}
 	}
 
+	if (ast_test_flag(global_flags, MOH_CACHERTCLASSES)) {
+		mohclass = get_mohbyname(mohclass->name, 0);
+	}
+
 	if (!mohclass) {
 		return -1;
 	}