diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 15:17:50 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 15:17:50 +0000 |
| commit | 9bf8856f3fa2b9ea204d69209aa23725f61d2079 (patch) | |
| tree | 5fdff1252cf52e77ad065e92c6d0b428c4e89196 | |
| parent | 7858313d1072451c56169008fd7d7c1da984b958 (diff) | |
Merged revisions 218224 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@218227 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_directed_pickup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index d59488aa0..0f6eb0a90 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -146,7 +146,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; |