summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2003-07-08 18:50:02 +0000
committerMark Spencer <markster@digium.com>2003-07-08 18:50:02 +0000
commita5a9db828e0dcae7b72339f175bf91b48603a05e (patch)
tree2f1a06004e26cc94ef7755f3290bf82f52d41147
parent3b84a3f8a41b58ada1c59aa75837ebe6ab96560a (diff)
Don't retry lock if there is no channel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xchannels/chan_agent.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 0e90ac39b..29dc13a5a 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -438,10 +438,12 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
p->app_sleep_cond = 0;
if( pthread_mutex_trylock(&p->app_lock) )
{
- ast_queue_frame(p->chan, &null_frame, 1);
- ast_pthread_mutex_unlock(&p->lock); /* For other thread to read the condition. */
- ast_pthread_mutex_lock(&p->app_lock);
- ast_pthread_mutex_lock(&p->lock);
+ if (p->chan) {
+ ast_queue_frame(p->chan, &null_frame, 1);
+ ast_pthread_mutex_unlock(&p->lock); /* For other thread to read the condition. */
+ ast_pthread_mutex_lock(&p->app_lock);
+ ast_pthread_mutex_lock(&p->lock);
+ }
if( !p->chan )
{
ast_log(LOG_WARNING, "Agent disconnected while we were connecting the call\n");