Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv20321/apps
Modified Files:
app_queue.c
Log Message:
fix queues properly (issue #5300, take two)
Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- app_queue.c 29 Sep 2005 04:12:08 -0000 1.165
+++ app_queue.c 30 Sep 2005 14:01:56 -0000 1.166
@@ -761,7 +761,9 @@
return q;
}
}
- }
+ } else if (!member_config)
+ /* Not found in the list, and it's not realtime ... */
+ return NULL;
/* Check if queue is defined in realtime. */
if (!queue_vars) {
@@ -872,12 +874,12 @@
Thus we might see an empty member list when a queue is
deleted. In practise, this is unlikely to cause a problem. */
queue_vars = ast_load_realtime("queues", "name", queuename, NULL);
- if(queue_vars)
+ if (queue_vars) {
member_config = ast_load_realtime_multientry("queue_members",
"interface LIKE", "%", "queue_name", queuename, NULL);
-
- if (!member_config) {
- ast_log(LOG_ERROR, "no queue_members defined in your config
(extconfig.conf).\n");
- return res;
+ if (!member_config) {
+ ast_log(LOG_ERROR, "no queue_members defined in your
config (extconfig.conf).\n");
+ return res;
+ }
}
ast_mutex_lock(&qlock);
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
