From e295953eb994a1d5f24d75aaa2d8aa599be25827 Mon Sep 17 00:00:00 2001 From: tilghman Date: Fri, 11 Sep 2009 06:00:28 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@218055 f38db490-d61c-443f-a65b-d21fe96a405b --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/pbx.c b/main/pbx.c index 55dc233e3..4ada0f4bf 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -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); /* 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; } else { ast_copy_string(dst_exten, c->exten, sizeof(dst_exten)); -- cgit v1.2.3