[asterisk-commits] tilghman: trunk r240175 - /trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Jan 14 11:34:53 2010
New Revision: 240175

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240175
Log:
Similarly, ensure that matchcid is duplicated correctly when merging contexts.

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=240175&r1=240174&r2=240175
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Jan 14 11:34:53 2010
@@ -6921,7 +6921,7 @@
 				dupdstr = ast_strdup(prio_item->data);
 
 				res1 = ast_add_extension2(new, 0, prio_item->exten, prio_item->priority, prio_item->label, 
-										  prio_item->cidmatch, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar);
+										  prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar);
 				if (!res1 && new_exten_item && new_prio_item){
 					ast_verb(3,"Dropping old dialplan item %s/%s/%d [%s(%s)] (registrar=%s) due to conflict with new dialplan\n",
 							context->name, prio_item->exten, prio_item->priority, prio_item->app, (char*)prio_item->data, prio_item->registrar);