aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_agent.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-08-26 03:50:01 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-08-26 03:50:01 +0000
commit025135e4e547c996700d8699a2db86e9a5062f33 (patch)
tree68ee700c322771bad560a1b255d81a81ac19a564 /channels/chan_agent.c
parent7c03aa99f89e23d5076b4a705689fd37af176bcb (diff)
Make res deterministic, don't release lock until totally done
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1436 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_agent.c')
-rwxr-xr-xchannels/chan_agent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c5181f9a4..ee33b145b 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -488,8 +488,6 @@ static int agent_hangup(struct ast_channel *ast)
}
#endif
ast_mutex_unlock(&p->lock);
- /* Release ownership of the agent to other threads (presumably running the login app). */
- ast_mutex_unlock(&p->app_lock);
if (p->pending) {
ast_mutex_lock(&agentlock);
@@ -508,6 +506,8 @@ static int agent_hangup(struct ast_channel *ast)
/* Store last disconnect time */
gettimeofday(&p->lastdisc, NULL);
ast_mutex_unlock(&p->lock);
+ /* Release ownership of the agent to other threads (presumably running the login app). */
+ ast_mutex_unlock(&p->app_lock);
}
return 0;
}
@@ -539,7 +539,7 @@ static int agent_cont_sleep( void *data )
static int agent_ack_sleep( void *data )
{
struct agent_pvt *p;
- int res;
+ int res=0;
int to = 1000;
/* Wait a second and look for something */