Merged revisions 51148 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 16 Jan 2007 17:42:47 +0000 (17:42 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 16 Jan 2007 17:42:47 +0000 (17:42 +0000)
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

res/res_features.c

index 1aba2c1..e44090a 100644 (file)
@@ -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 */