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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jul  6 10:28:28 2007
New Revision: 73676

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

................
r73675 | mmichelson | 2007-07-06 10:27:28 -0500 (Fri, 06 Jul 2007) | 13 lines

Merged revisions 73674 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73674 | mmichelson | 2007-07-06 10:26:40 -0500 (Fri, 06 Jul 2007) | 5 lines

Fixed a bug wherein agents get stuck busy. (issue 9618, reported by jiddings, patched by moi)

closes issue #9618


........

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

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=73676&r1=73675&r2=73676
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Fri Jul  6 10:28:28 2007
@@ -1284,7 +1284,7 @@
 #if 0
 				ast_log(LOG_NOTICE, "Time now: %ld, Time of lastdisc: %ld\n", tv.tv_sec, p->lastdisc.tv_sec);
 #endif
-				if (!p->lastdisc.tv_sec || (tv.tv_sec > p->lastdisc.tv_sec)) {
+				if (!p->lastdisc.tv_sec || (tv.tv_sec >= p->lastdisc.tv_sec)) {
 					p->lastdisc = ast_tv(0, 0);
 					/* Agent must be registered, but not have any active call, and not be in a waiting state */
 					if (!p->owner && p->chan) {