From 518b0c0ab6386f0791139db27725e0a3e6a5753f Mon Sep 17 00:00:00 2001 From: mmichelson Date: Wed, 4 Feb 2009 17:46:12 +0000 Subject: 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 --- apps/app_chanspy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'apps') 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 */ -- cgit v1.2.3