[asterisk-commits] mmichelson: trunk r74726 - in /trunk: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 11 16:15:47 2007
New Revision: 74726

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74726
Log:
Merged revisions 74722 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r74722 | mmichelson | 2007-07-11 16:14:09 -0500 (Wed, 11 Jul 2007) | 13 lines

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)


........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_agent.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=74726&r1=74725&r2=74726
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Wed Jul 11 16:15:47 2007
@@ -1474,9 +1474,9 @@
 				}
 			} else {
 				logintime = time(NULL) - p->loginstart;
-				p->loginstart = 0;
 				agent_logoff_maintenance(p, p->loginchan, logintime, NULL, "CommandLogoff");
 			}
+			p->loginstart = 0;
 			break;
 		}
 	}
@@ -1901,6 +1901,8 @@
 						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);