diff options
| author | Steve Murphy <murf@digium.com> | 2008-08-22 22:32:35 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-08-22 22:32:35 +0000 |
| commit | de1af295c8951923b8681682d2a45b4a98bce4ce (patch) | |
| tree | 7708f2bb3d70a591a116bb96ee0d44c423592a67 /main | |
| parent | 2488366a753fb228f4cead7bbf0b2d079141b6b8 (diff) | |
Merged revisions 139635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines
I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index b0e7a11b1..f04c2923f 100644 --- a/main/features.c +++ b/main/features.c @@ -2360,7 +2360,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast ast_copy_string(chan->exten, save_exten, sizeof(chan->exten)); chan->priority = save_prio; chan->cdr = swapper; - ast_channel_lock(chan); + ast_channel_unlock(chan); /* protect the lastapp/lastdata against the effects of the hangup/dialplan code */ ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp)); ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata)); |