mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
Merged revisions 173397 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r173397 | mmichelson | 2009-02-04 11:45:14 -0600 (Wed, 04 Feb 2009) | 11 lines Merged revisions 173396 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r173396 | mmichelson | 2009-02-04 11:44:48 -0600 (Wed, 04 Feb 2009) | 3 lines Revert my previous change because it was stupid ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@173398 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -274,10 +274,8 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
|
||||
}
|
||||
ast_mutex_unlock(&spyee_chanspy_ds->lock);
|
||||
|
||||
if (!spyee) {
|
||||
ast_channel_unlock(spyee);
|
||||
if (!spyee)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* We now hold the channel lock on spyee */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user