From: Automerge script <automerge@asterisk.org>
Date: Tue, 14 Mar 2006 19:05:40 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.6-netsec~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10fe0e9c67665aa9b432942854a1e5e6759a5808;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 4ef6cad83c..2682ebf39b 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1414,7 +1414,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 			}
 			ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]);
 			ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]);
-			peer->priority++;
 			ast_pbx_start(peer);
 			hanguptree(outgoing, NULL);
 			LOCAL_USER_REMOVE(u);
diff --git a/apps/app_queue.c b/apps/app_queue.c
index c5aff80d05..505ac2f855 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -941,7 +941,7 @@ static struct ast_call_queue *load_realtime_queue(char *queuename)
 	}
 	ast_mutex_unlock(&qlock);
 
-	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.