diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-12 23:02:33 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-12 23:02:33 +0000 |
| commit | e3fad44b06f9b96b72179b64717ffcca50047aaa (patch) | |
| tree | 598f3453b56b4163ca68b727012533bdc65abe52 /channels | |
| parent | c09a8dbf7d9e1a12879116afa09c6f32695424f4 (diff) | |
Merged revisions 74997 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74999 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 2970735b6..cda841fa5 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1465,18 +1465,18 @@ static int agent_logoff(const char *agent, int soft) if (!strcasecmp(p->agent, agent)) { ret = 0; if (p->owner || p->chan) { - p->deferlogoff = 1; if (!soft) { if (p->owner) ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); if (p->chan) ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); - } + } else + p->deferlogoff = 1; } else { logintime = time(NULL) - p->loginstart; + p->loginstart = 0; agent_logoff_maintenance(p, p->loginchan, logintime, NULL, "CommandLogoff"); } - p->loginstart = 0; break; } } @@ -1901,8 +1901,10 @@ static int login_exec(struct ast_channel *chan, void *data) ast_device_state_changed("Agent/%s", p->agent); while (res >= 0) { ast_mutex_lock(&p->lock); - if (!p->loginstart && p->chan) + if (p->deferlogoff && p->chan) { ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); + p->deferlogoff = 0; + } if (p->chan != chan) res = -1; ast_mutex_unlock(&p->lock); |