Merged revisions 144677 via svnmerge from
authorSteve Murphy <murf@digium.com>
Fri, 26 Sep 2008 17:50:35 +0000 (17:50 +0000)
committerSteve Murphy <murf@digium.com>
Fri, 26 Sep 2008 17:50:35 +0000 (17:50 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r144677 | murf | 2008-09-26 11:47:13 -0600 (Fri, 26 Sep 2008) | 12 lines

(closes issue #13563)
Reported by: mnicholson
Patches:
      found1.diff uploaded by mnicholson (license 96)

This patch was mainly meant to apply to trunk and 1.6.x,
but I'm applying it to 1.4 also, which should be a perfectly
harmless fix to the vast majority of users who are not using
external switches, but the few who might be affected
will not have to go to the pain of filing a bug report.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@144678 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/pbx.c

index af3090c..4fff74b 100644 (file)
@@ -3188,6 +3188,8 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
                        return pbx_exec(c, app, passdata);      /* 0 on success, -1 on failure */
                }
        } else if (q.swo) {     /* not found here, but in another switch */
+               if (found)
+                       *found = 1;
                ast_unlock_contexts();
                if (matching_action) {
                        return -1;