[svn-commits] murf: branch 1.6.0 r120829 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: murf
Date: Thu Jun  5 16:39:24 2008
New Revision: 120829

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120829
Log:
Merged revisions 120828 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r120828 | murf | 2008-06-05 15:34:42 -0600 (Thu, 05 Jun 2008) | 1 line

a small fix for a crash that occurs when compiling AEL with global vars
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=120829&r1=120828&r2=120829
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Thu Jun  5 16:39:24 2008
@@ -7593,7 +7593,7 @@
 			pbx_builtin_setvar_helper(chan, pair.name, pair.value);
 			if (strchr(pair.name, ' '))
 				ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value);
-		} else if (chan) {
+		} else if (!chan) {
 			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name);
 		} else {
 			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority);