automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37221 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index e41ee0994d6b6ab5ee8291710fb2aba5701869b2..65a8fbef48d2b529279a69796064b782d86ceaec 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -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);