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

Fix F and F(x) action logic in Queue application.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-06-22 21:51:05 +00:00
parent 3d1e26d2d2
commit 30a417dc6c
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_queue.c
View File

@@ -5474,20 +5474,17 @@ static int try_calling(struct queue_ent *qe, const struct ast_flags opts, char *
}
if (!ast_check_hangup(peer) && ast_test_flag(&opts, OPT_CALLEE_GO_ON)) {
int goto_res;
if (!ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GO_ON])) {
ast_replace_subargument_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]);
if (ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]) == AST_PBX_SUCCESS) {
ast_pbx_start(peer);
} else {
ast_hangup(peer);
}
goto_res = ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]);
} else { /* F() */
if (ast_goto_if_exists(peer, caller_context, caller_extension, caller_priority + 1) == AST_PBX_GOTO_FAILED) {
ast_hangup(peer);
} else {
ast_pbx_start(peer);
}
goto_res = ast_goto_if_exists(peer, caller_context, caller_extension,
caller_priority + 1);
}
if (goto_res || ast_pbx_start(peer)) {
ast_hangup(peer);
}
} else {
ast_hangup(peer);