[Asterisk-cvs] asterisk/apps app_queue.c,1.129,1.130

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv25425/apps

Modified Files:
	app_queue.c 
Log Message:
Fix strict mode for queues (bug #3913)


Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- app_queue.c	28 Mar 2005 20:48:24 -0000	1.129
+++ app_queue.c	31 Mar 2005 19:06:08 -0000	1.130
@@ -489,7 +489,7 @@
 			stat = get_member_status(q);
 			if (!q->joinempty && (stat == QUEUE_NO_MEMBERS))
 				*reason = QUEUE_JOINEMPTY;
-			else if ((q->joinempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS))
+			else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS))
 				*reason = QUEUE_JOINUNAVAIL;
 			else if (q->maxlen && (q->count >= q->maxlen))
 				*reason = QUEUE_FULL;
@@ -1343,7 +1343,7 @@
 		}
 
 		/* leave the queue if no reachable agents, if enabled */
-		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
+		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
 			*reason = QUEUE_LEAVEUNAVAIL;
 			leave_queue(qe);
 			break;
@@ -2418,7 +2418,7 @@
 				}
 
 				/* leave the queue if no reachable agents, if enabled */
-				if ((qe.parent->leavewhenempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
+				if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
 					reason = QUEUE_LEAVEUNAVAIL;
 					res = 0;
 					break;