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.1@218054 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 5fa6cf6ba40e9c64ad52851638e25227ecb80cd0..82ce13fc3c49bd4053ab3498eff6c26325da4828 100644 (file)
--- 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));