aboutsummaryrefslogtreecommitdiffstats
path: root/main/features.c
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-29 21:19:46 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-29 21:19:46 +0000
commited98462df23f3bccb3dd0b40ac88c96c0af35e32 (patch)
treebdeeda68b33ce26ea7508f61b417ea56ef97a89d /main/features.c
parentce5a48f066c97489d93d4aacf29c100ab406e308 (diff)
Merged revisions 289340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r289340 | qwell | 2010-09-29 16:12:43 -0500 (Wed, 29 Sep 2010) | 22 lines Merged revisions 289339 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289339 | qwell | 2010-09-29 16:03:47 -0500 (Wed, 29 Sep 2010) | 15 lines Merged revisions 289338 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289338 | qwell | 2010-09-29 15:56:26 -0500 (Wed, 29 Sep 2010) | 8 lines Allow a manager originate to succeed on forwarded devices. The timeout to wait for an answer was being set to 0 when a device forwarded to another extension. We don't always need the timeout set like this, so make it an optional parameter, and don't use it in this case. ABE-2544 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@289354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index 0e9c8153c..9128a58cd 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2833,7 +2833,7 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller,
if (chan && (chan == active_channel)){
if (!ast_strlen_zero(chan->call_forward)) {
- if (!(chan = ast_call_forward(caller, chan, &to, format, NULL, outstate))) {
+ if (!(chan = ast_call_forward(caller, chan, NULL, format, NULL, outstate))) {
return NULL;
}
continue;