diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 16:49:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 16:49:12 +0000 |
| commit | 604972725d6443e145cc1344d5b91a94f3a6874d (patch) | |
| tree | 9df57ec67d82e432a214c23cd83cc42f9889c78f /channels/chan_zap.c | |
| parent | 782273ca463cc47bf63cb11429ce97e49fcac58f (diff) | |
revert my changes that converted the jb on the channel to be dynamically
allocated. These changes caused crashes when using a channel type that did
not support the jitterbuffer. Instead of fixing why it's crashing, I'm going
to implement this in a better way next week. The way I did it caused a
jitterbuffer to be allocated on every channel where the channel type supported
jitterbuffers, even if they were disabled.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35746 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 255ab663c..2f8e767f8 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5188,11 +5188,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int zt_confmute(i, 0); ast_setstate(tmp, state); /* Configure the new channel jb */ - if (ast_jb_configure(tmp, &global_jbconf)) { - ast_hangup(tmp); - i->owner = NULL; - return NULL; - } + ast_jb_configure(tmp, &global_jbconf); if (startpbx) { if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); |