kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-14 19:05:40 +00:00
parent f1fade4fa6
commit 10fe0e9c67
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_dial.c
View File

@@ -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(chan, opt_args[OPT_ARG_GOTO]);
ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]); ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]);
peer->priority++;
ast_pbx_start(peer); ast_pbx_start(peer);
hanguptree(outgoing, NULL); hanguptree(outgoing, NULL);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);

2
apps/app_queue.c
View File

@@ -941,7 +941,7 @@ static struct ast_call_queue *load_realtime_queue(char *queuename)
} }
ast_mutex_unlock(&qlock); ast_mutex_unlock(&qlock);
if (!q) { if (!q || q->realtime) {
/*! \note Load from realtime before taking the global qlock, to avoid blocking all /*! \note Load from realtime before taking the global qlock, to avoid blocking all
queue operations while waiting for the DB. queue operations while waiting for the DB.