kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 218224 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines
  
  Merged revisions 218223 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines
    
    Ensure we don't pickup ourselves when doing pickup by exten.
    
    (closes issue #15100)
    Reported by: lmsteffan
    Patches:
          (modified) pickup.patch uploaded by lmsteffan (license 779)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-09-14 15:22:12 +00:00
parent 2229b6b35f
commit 5debc02dda
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_directed_pickup.c
View File

@@ -94,7 +94,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch
while ((target = ast_channel_walk_locked(target))) {
if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) &&
!strcasecmp(target->dialcontext, context) &&
can_pickup(target)) {
(chan != target) && can_pickup(target)) {
res = pickup_do(chan, target);
ast_channel_unlock(target);
break;