summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-01 23:09:28 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-01 23:09:28 +0000
commit652d06f998bc5aec995ccbf92d86e474a3bf3028 (patch)
tree4c2173c4fa266238fccf0cd11a96c5bd9574b52e /res
parentbec319415f803690b2debf37c28261d5f0186f1f (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: https://origsvn.digium.com/svn/asterisk/trunk@38687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c1
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);