diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 17:46:12 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 17:46:12 +0000 |
commit | 518b0c0ab6386f0791139db27725e0a3e6a5753f (patch) | |
tree | 91d7afde99dc41cd9c4d4902ddef562b8cff9c79 /apps | |
parent | 7101e017d23cfa0bb2f3239349bb0ed393ecc921 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@173398 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index c9dc6f541..54960281f 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -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 */ |