diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-01 23:09:28 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-01 23:09:28 +0000 |
commit | 1a10d2d3b4f24514fdcc6e75c6ac744dcac51fa7 (patch) | |
tree | 4c2173c4fa266238fccf0cd11a96c5bd9574b52e /res | |
parent | 277c4886502663bcfb7248615262d1fdcea97eb9 (diff) |
Merged revisions 38686 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r38686 | kpfleming | 2006-08-01 18:07:06 -0500 (Tue, 01 Aug 2006) | 2 lines
ensure that the 'feature digit timeout' value is taken into account when deciding how long the bridge should run (this fixes a problem report where a digit press that did not invoke a feature is never passed across the bridge)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@38687 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_features.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c index 85ed558da..faf48b460 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1464,6 +1464,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast config->start_sound = NULL; config->firstpass = 0; } + config->start_time = ast_tvnow(); config->feature_timer = featuredigittimeout; if (option_debug) ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->feature_timer); |