diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-11 21:14:09 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-11 21:14:09 +0000 |
commit | 3799f6b3099c99bdc7a7fd0329b3f797168b6566 (patch) | |
tree | c4f9b7fc4d9f8487dae6ba703744929fca449e84 /channels/chan_agent.c | |
parent | 6dc54fa049433465e58762f3f62e984a4aae8936 (diff) |
Merged revisions 74719 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r74719 | mmichelson | 2007-07-11 16:12:30 -0500 (Wed, 11 Jul 2007) | 5 lines
The cli command "agent logoff Agent/x soft" did not work...at all. Now it does.
(closes issue #10178, reported and patched by makoto, with slight modification for 1.4 and trunk by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@74722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_agent.c')
-rw-r--r-- | channels/chan_agent.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 15a096cd3..9a87b6f88 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1537,9 +1537,9 @@ static int agent_logoff(const char *agent, int soft) } } else { logintime = time(NULL) - p->loginstart; - p->loginstart = 0; agent_logoff_maintenance(p, p->loginchan, logintime, NULL, "CommandLogoff"); } + p->loginstart = 0; break; } } @@ -2071,6 +2071,8 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode) ast_device_state_changed("Agent/%s", p->agent); while (res >= 0) { ast_mutex_lock(&p->lock); + if (!p->loginstart && p->chan) + ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); if (p->chan != chan) res = -1; ast_mutex_unlock(&p->lock); |