summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-01-16 17:42:47 +0000
committerJoshua Colp <jcolp@digium.com>2007-01-16 17:42:47 +0000
commit0f456a07e36ef99df8b9595d69dd4aacbadf0e5f (patch)
tree0c7270ba9e098933000a35af8e89588679775470 /res
parentdad1116c7250c4d19d67760d4b28761885bd7065 (diff)
Merged revisions 51148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51148 | file | 2007-01-16 12:39:50 -0500 (Tue, 16 Jan 2007) | 10 lines Merged revisions 51145 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51145 | file | 2007-01-16 12:36:50 -0500 (Tue, 16 Jan 2007) | 2 lines Return previous behavior. ParkedCalls will be able to do DTMF based transfers again. trunk however will get an option to allow this to be set on/off. (issue #8804 reported by nortex) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 1aba2c199..e44090a33 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1828,6 +1828,8 @@ static int park_exec(struct ast_channel *chan, void *data)
ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
memset(&config, 0, sizeof(struct ast_bridge_config));
+ ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
+ ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
res = ast_bridge_call(chan, peer, &config);
/* Simulate the PBX hanging up */