kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-01-24 23:00:59 +00:00
parent 2e10d5244e
commit d7812f6634
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
asterisk.c
View File

@@ -18,6 +18,7 @@
/* Doxygenified Copyright Header */ /* Doxygenified Copyright Header */
/*! /*!
* \mainpage Asterisk -- An Open Source Telephony Toolkit * \mainpage Asterisk -- An Open Source Telephony Toolkit
* *

8
channel.c
View File

@@ -2005,10 +2005,12 @@ int ast_indicate(struct ast_channel *chan, int condition)
{ {
int res = -1; 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); 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) if (chan->tech->indicate)
res = chan->tech->indicate(chan, condition); res = chan->tech->indicate(chan, condition);
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);