mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
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/trunk@218224 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user