diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 17:46:36 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 17:46:36 +0000 |
| commit | bd3c2ca27b038594ddc9d03a7c972133d15fabe5 (patch) | |
| tree | e207cc541628acc2c68db943e9b0f2f05da7e4df /apps | |
| parent | b1999c799b27401470170b92dd905f2ebeab42ee (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.1@173399 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 08f2e7aa9..f05a22ac0 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -340,10 +340,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 */ |