Merged revisions 329145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r329145 | rmudgett | 2011-07-21 11:52:17 -0500 (Thu, 21 Jul 2011) | 16 lines Merged revisions 329144 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r329144 | rmudgett | 2011-07-21 11:46:21 -0500 (Thu, 21 Jul 2011) | 9 lines Dialplan bridge() app mutex 'current_dest_chan' freed more times than we've locked! This appears to be a leftover from when ast_channel was converted to ao2 objects. Simply removed the extraneous unlock. (closes issue ASTERISK-17772) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329146 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
c3f386fc6b
commit
ce2f61013b
|
@ -6149,8 +6149,6 @@ static int bridge_exec(struct ast_channel *chan, const char *data)
|
|||
"Channel2: %s\r\n", chan->name, args.dest_chan);
|
||||
}
|
||||
|
||||
ast_channel_unlock(current_dest_chan);
|
||||
|
||||
do_bridge_masquerade(current_dest_chan, final_dest_chan);
|
||||
|
||||
chans[0] = current_dest_chan;
|
||||
|
|
Reference in New Issue