diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-14 19:05:40 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-14 19:05:40 +0000 |
| commit | d87e72a441acbe102b544380830765f9206910d5 (patch) | |
| tree | fc3570b77a3986e066d36dba4cdde2b0f6fe0430 | |
| parent | 7356684981682b1e6f91dac087c5ae19ca05b92a (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@12959 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_dial.c | 1 | ||||
| -rw-r--r-- | apps/app_queue.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 4ef6cad83..2682ebf39 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 c5aff80d0..505ac2f85 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. |