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 4ef6cad83c63d5a07b6ff954b17bc83632c1b1a4..2682ebf39b36e86f22a894dd2769273064e7e861 100644 (file)
--- 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 c5aff80d05313e149dfe1842649e1fb3b86f65dc..505ac2f85525c52a92fc702c9ed37b3b0b7cdbc4 100644 (file)
--- 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.