From fb1a08e168cded10678fee86dff641a128cb6acb Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Fri, 26 Sep 2008 17:52:04 +0000 Subject: [PATCH] Merged revisions 144678 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r144678 | murf | 2008-09-26 11:50:35 -0600 (Fri, 26 Sep 2008) | 20 lines Merged revisions 144677 via svnmerge from 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/branches/1.6.0@144679 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/pbx.c b/main/pbx.c index c411672c8d..70f1f0c501 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3113,6 +3113,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;