dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@144678 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
murf 2008-09-26 17:50:35 +00:00
parent fd606789e9
commit fce2faea65
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pbx.c
View 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;