diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 22:35:14 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 22:35:14 +0000 |
| commit | 93e721b47ce27bb4ab144acaf5aa95d5b89b0e1a (patch) | |
| tree | bd67afc504b87b00e5b60369cd3ceab370c96363 /main | |
| parent | d533fe5e3abdbe6dd26b980e14b3e093bbe462f3 (diff) | |
Merged revisions 139662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r139662 | murf | 2008-08-22 16:32:35 -0600 (Fri, 22 Aug 2008) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@139671 f38db490-d61c-443f-a65b-d21fe96a405b
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 6e79345c8..d823e102f 100644 --- a/main/features.c +++ b/main/features.c @@ -2177,7 +2177,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)); |