aboutsummaryrefslogtreecommitdiffstats
path: root/main/channel.c
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 15:25:09 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 15:25:09 +0000
commit9f3c1ad6d1c33077f2db07755ba7c51dccc6ecb9 (patch)
tree64ed37bcfd76f92757a769cb02103b29a6b50d64 /main/channel.c
parent1a5a1ddf50b61e638a8db5217ea072039e83f992 (diff)
parent90fcc2c35ba4abb6432ee2f9472cdcba8e88f44f (diff)
Create Asterisk 1.6.0.27 release from 1.6.0.27-rc3.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27@260607 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r--main/channel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c
index d9b0173c5..e9f7f4359 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1986,25 +1986,22 @@ int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen,
int res = 0;
ast_channel_lock(chan);
-
if (chan->generatordata) {
if (chan->generator && chan->generator->release)
chan->generator->release(chan, chan->generatordata);
chan->generatordata = NULL;
}
-
- ast_prod(chan);
if (gen->alloc && !(chan->generatordata = gen->alloc(chan, params))) {
res = -1;
}
-
if (!res) {
ast_settimeout(chan, 160, generator_force, chan);
chan->generator = gen;
}
-
ast_channel_unlock(chan);
+ ast_prod(chan);
+
return res;
}