[asterisk-commits] file: trunk r170051 - in /trunk: ./ main/pbx.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jan 22 09:14:50 CST 2009


Author: file
Date: Thu Jan 22 09:14:50 2009
New Revision: 170051

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170051
Log:
Merged revisions 170050 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines
  
  Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness.
  (closes issue #14011)
  Reported by: dveiga
  Patches:
        pbx.c.patch uploaded by dveiga (license 665)
........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/pbx.c?view=diff&rev=170051&r1=170050&r2=170051
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Jan 22 09:14:50 2009
@@ -8644,7 +8644,7 @@
 			ast_stopstream(chan);
 		}
 	}
-	if (args.context != chan->context && res) {
+	if (strcmp(args.context, chan->context) && res) {
 		snprintf(chan->exten, sizeof(chan->exten), "%c", res);
 		ast_copy_string(chan->context, args.context, sizeof(chan->context));
 		chan->priority = 0;




More information about the asterisk-commits mailing list