diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 17:39:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 17:39:37 +0000 |
| commit | 34aa1211b4ff2ef52a34de18105cfa4d76b4102c (patch) | |
| tree | d00a7dc2f33b2bd2a62d5898d6b6a7428cbba6f1 /main/pbx.c | |
| parent | cc20956ba94cb4778e579a7e0bb5c720c07e9ee9 (diff) | |
Merged revisions 240175 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines
Similarly, ensure that matchcid is duplicated correctly when merging contexts.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@240177 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index e87d7d0c9..38af4deee 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6040,7 +6040,7 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab * 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); |