automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-06 21:01:31 +00:00
parent 2fb94832b5
commit da8d720b2a

View File

@@ -795,14 +795,16 @@ static int agent_hangup(struct ast_channel *ast)
ast_mutex_lock(&p->chan->lock);
ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
ast_mutex_unlock(&p->chan->lock);
} else {
} else if (p->loginstart) {
ast_mutex_lock(&p->chan->lock);
ast_moh_start(p->chan, p->moh);
ast_mutex_unlock(&p->chan->lock);
}
}
ast_mutex_unlock(&p->lock);
ast_device_state_changed("Agent/%s", p->agent);
/* Only register a device state change if the agent is still logged in */
if (p->loginstart)
ast_device_state_changed("Agent/%s", p->agent);
if (p->pending) {
ast_mutex_lock(&agentlock);