diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:59:49 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:59:49 +0000 |
| commit | da95d6a01c9e4d95cddc3367ce449308ddfdaaf7 (patch) | |
| tree | d7f10aa98fc39373b6433d6c275b12ce5da11360 /main | |
| parent | 11791b5d73efd80018f47f429b8c8146adfd1412 (diff) | |
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.1@218054 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 5fa6cf6ba..82ce13fc3 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3776,7 +3776,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)); |