Merged revisions 12925 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 14 Mar 2006 18:30:52 +0000 (18:30 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 14 Mar 2006 18:30:52 +0000 (18:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r12925 | russell | 2006-03-14 13:28:39 -0500 (Tue, 14 Mar 2006) | 3 lines

fix a problem with not loading realtime queue members by always reloading a
realtime queue from the database even if it is found in the list (issue #6680)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12926 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index 79a0858..072024b 100644 (file)
@@ -952,7 +952,7 @@ static struct ast_call_queue *load_realtime_queue(char *queuename)
        }
        AST_LIST_UNLOCK(&queues);
 
-       if (!q) {
+       if (!q || q->realtime) {
                /*! \note Load from realtime before taking the global qlock, to avoid blocking all
                   queue operations while waiting for the DB.