From: Matthew Jordan Date: Sun, 17 Aug 2014 23:09:43 +0000 (+0000) Subject: apps/app_dial: Fix Dial 'z' option X-Git-Tag: 13.0.0-beta2~2^2~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d4e581f358423276a40b987e6470ce65d0a7e7;p=thirdparty%2Fasterisk.git apps/app_dial: Fix Dial 'z' option The 'z' option is supposed to disable the dial timeout in the case of a call forward. Unfortunately, the wrong timeout timer was passed to the do_forward function, resulting in the option not working. ASTERISK-24225 #close Reported by: dimitripietro Tested by: dimitripietro patches: jira_asterisk_24225_v1.8.patch uploaded by rmudgett (License 5621) jira_asterisk_24225_v11.patch uploaded by rmudgett (License 5621) ........ Merged revisions 421232 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 421233 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 421234 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421235 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_dial.c b/apps/app_dial.c index 7c0cc62995..174ff776ea 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1215,7 +1215,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, ast_channel_unlock(in); } - do_forward(o, &num, peerflags, single, caller_entertained, to, + do_forward(o, &num, peerflags, single, caller_entertained, &orig, forced_clid, stored_clid); if (single && o->chan