kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 59887 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r59887 | russell | 2007-04-03 13:01:49 -0500 (Tue, 03 Apr 2007) | 13 lines

Merged revisions 59886 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59886 | russell | 2007-04-03 12:58:19 -0500 (Tue, 03 Apr 2007) | 5 lines

When doing a built-in blind or attended transfer, restore the ability to use '#'
to terminate the number and immediately do the transfer instead of having to
dial the number and just wait for the feature digit timeout.
(issue #8366, xueliangliang)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-04-03 18:02:47 +00:00
parent 169fc7945e
commit 9355b4ddca
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/app.c
View File

@@ -85,14 +85,11 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
ast_playtones_stop(chan); ast_playtones_stop(chan);
if (res < 1) if (res < 1)
break; break;
collect[x++] = res; if (res == '#')
if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) { break;
if (collect[x-1] == '#') { collect[x++] = res;
/* Not a valid extension, ending in #, assume the # was to finish dialing */ if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
collect[x-1] = '\0';
}
break; break;
}
} }
if (res >= 0) if (res >= 0)
res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0; res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0;