diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /main/pickup.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pickup.c')
| -rw-r--r-- | main/pickup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/main/pickup.c b/main/pickup.c index a415f1672..7ae6927fa 100644 --- a/main/pickup.c +++ b/main/pickup.c @@ -354,17 +354,11 @@ int ast_do_pickup(struct ast_channel *chan, struct ast_channel *target) /* setting the HANGUPCAUSE so the ringing channel knows this call was not a missed call */ ast_channel_hangupcause_set(chan, AST_CAUSE_ANSWERED_ELSEWHERE); - ast_channel_lock(chan); - chan_snapshot = ast_channel_snapshot_create(chan); - ast_channel_unlock(chan); - if (!chan_snapshot) { + if (!(chan_snapshot = ast_channel_snapshot_create(chan))) { goto pickup_failed; } - ast_channel_lock(target); - target_snapshot = ast_channel_snapshot_create(target); - ast_channel_unlock(target); - if (!target_snapshot) { + if (!(target_snapshot = ast_channel_snapshot_create(target))) { goto pickup_failed; } |