diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-03-19 10:11:29 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-03-19 10:11:29 +0000 |
| commit | fc9d3ba21b91dacd84638abd0d6014de8768110f (patch) | |
| tree | f96fe244c324ab88b97b649a8879f6a631c223fb /apps/app_dial.c | |
| parent | d7b5a18f4ce973d1d90f70c29d058088059da199 (diff) | |
Merged revisions 13550 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13550 | russell | 2006-03-19 04:59:55 -0500 (Sun, 19 Mar 2006) | 4 lines
revert the change made in revision 12927 in favor of keeping the original
behavior of the option. The documentation has now been updated to reflect
the actual behavior. (issue #6523)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 6b51670a1..22f3e213b 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -112,9 +112,10 @@ static char *descrip = " other than the number assigned to the caller.\n" " g - Proceed with dialplan execution at the current extension if the\n" " destination channel hangs up.\n" -" G(context^exten^pri) - If the call is answered, transfer both parties to\n" -" the specified priority. Optionally, an extension, or extension and\n" -" context may be specified. Otherwise, the current extension is used.\n" +" G(context^exten^pri) - If the call is answered, transfer the calling party to\n" +" the specified priority and the called party to the specified priority+1.\n" +" Optionally, an extension, or extension and context may be specified. \n" +" Otherwise, the current extension is used.\n" " h - Allow the called party to hang up by sending the '*' DTMF digit.\n" " H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n" " j - Jump to priority n+101 if all of the requested channels were busy.\n" @@ -1425,6 +1426,7 @@ 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); |