diff options
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index 7b16436c9..512e1962e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2507,9 +2507,9 @@ static void send_dtmf_event(const struct ast_channel *chan, const char *directio static void ast_read_generator_actions(struct ast_channel *chan, struct ast_frame *f) { - if (chan->generatordata && !ast_internal_timing_enabled(chan)) { + if (chan->generator && chan->generator->generate && chan->generatordata && !ast_internal_timing_enabled(chan)) { void *tmp = chan->generatordata; - int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples) = NULL; + int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples) = chan->generator->generate; int res; int samples; @@ -2528,9 +2528,6 @@ static void ast_read_generator_actions(struct ast_channel *chan, struct ast_fram samples = f->samples; } - if (chan->generator->generate) { - generate = chan->generator->generate; - } /* This unlock is here based on two assumptions that hold true at this point in the * code. 1) this function is only called from within __ast_read() and 2) all generators * call ast_write() in their generate callback. |