From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 14 Mar 2006 18:30:52 +0000 (+0000)
Subject: Merged revisions 12925 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f28abd4020bfcbee04f4a17b949dbf33bd08eebc;p=thirdparty%2Fasterisk.git

Merged revisions 12925 via svnmerge from
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
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 79a085879c..072024ba77 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -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.