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: https://origsvn.digium.com/svn/asterisk/branches/1.4@74722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-07-11 21:14:09 +00:00
parent 8b7295be2d
commit b827d5a183

View File

@@ -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);