From d7812f663428f398090c9fd974b064069f786fcc Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Tue, 24 Jan 2006 23:00:59 +0000
Subject: [PATCH] automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 asterisk.c | 1 +
 channel.c  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/asterisk.c b/asterisk.c
index 2d17fad512..cc23c4ff35 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -18,6 +18,7 @@
 
 
 /* Doxygenified Copyright Header */
+
 /*!
  * \mainpage Asterisk -- An Open Source Telephony Toolkit
  *
diff --git a/channel.c b/channel.c
index 56d06978d2..ff5390c95b 100644
--- a/channel.c
+++ b/channel.c
@@ -2005,10 +2005,12 @@ int ast_indicate(struct ast_channel *chan, int condition)
 {
 	int res = -1;
 
-	/* Stop if we're a zombie or need a soft hangup */
-	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) 
-		return -1;
 	ast_mutex_lock(&chan->lock);
+	/* Stop if we're a zombie or need a soft hangup */
+	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
+		ast_mutex_unlock(&chan->lock);
+		return -1;
+	}
 	if (chan->tech->indicate)
 		res = chan->tech->indicate(chan, condition);
 	ast_mutex_unlock(&chan->lock);