Merged revisions 218050 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r218050 | tilghman | 2009-09-11 00:58:11 -0500 (Fri, 11 Sep 2009) | 3 lines
  
  Check the origination priority for more matches, not the current priority.
  Found by Pavel Troller on the -dev list.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@218055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Tilghman Lesher 17 years ago
parent b509ba227f
commit d392fb412c

@ -4269,7 +4269,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c,
ast_verb(2, "Spawn extension (%s, %s, %d) exited INCOMPLETE on '%s'\n", c->context, c->exten, c->priority, c->name); ast_verb(2, "Spawn extension (%s, %s, %d) exited INCOMPLETE on '%s'\n", c->context, c->exten, c->priority, c->name);
/* Don't cycle on incomplete - this will happen if the only extension that matches is our "incomplete" extension */ /* Don't cycle on incomplete - this will happen if the only extension that matches is our "incomplete" extension */
if (!ast_matchmore_extension(c, c->context, c->exten, c->priority, c->cid.cid_num)) { if (!ast_matchmore_extension(c, c->context, c->exten, 1, c->cid.cid_num)) {
invalid = 1; invalid = 1;
} else { } else {
ast_copy_string(dst_exten, c->exten, sizeof(dst_exten)); ast_copy_string(dst_exten, c->exten, sizeof(dst_exten));

Loading…
Cancel
Save