diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 18:02:47 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 18:02:47 +0000 |
| commit | ae187ec97e290a7dba46a47152f53d31fe08fe68 (patch) | |
| tree | 889546ef35dd07e5a03678141867829e8b16228f /main/app.c | |
| parent | cdedde3335a34d7d2319219416e5163989548e56 (diff) | |
Merged revisions 59887 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@59888 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/app.c b/main/app.c index bea481a2b..eb8101709 100644 --- a/main/app.c +++ b/main/app.c @@ -85,14 +85,11 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, ast_playtones_stop(chan); if (res < 1) break; + if (res == '#') + break; collect[x++] = res; - if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) { - if (collect[x-1] == '#') { - /* Not a valid extension, ending in #, assume the # was to finish dialing */ - collect[x-1] = '\0'; - } + if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) break; - } } if (res >= 0) res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0; |