From 3772baef1ffefc0e6d7fcf344d2c624d2d62bfb9 Mon Sep 17 00:00:00 2001 From: murf Date: Fri, 22 Aug 2008 22:32:35 +0000 Subject: 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/trunk@139662 f38db490-d61c-443f-a65b-d21fe96a405b --- main/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') 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)); -- cgit v1.2.3