diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 14:57:23 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 14:57:23 +0000 |
| commit | c847a454ced2467a7a3bc6553ac3b523359a79a6 (patch) | |
| tree | e91fb8a392002e25f27153d6a817823e80eeb82e /apps/app_directed_pickup.c | |
| parent | 208b0d0155a288e316e0d15b5320b80b0d2aa945 (diff) | |
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/trunk@218224 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_directed_pickup.c')
| -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 8a8297e97..a6ca09ac5 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -216,7 +216,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch while ((target = ast_channel_iterator_next(iter))) { ast_channel_lock(target); - if (can_pickup(target)) { + if ((chan != target) && can_pickup(target)) { break; } ast_channel_unlock(target); |