diff options
author | Joshua Colp <jcolp@digium.com> | 2006-08-07 00:17:12 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2006-08-07 00:17:12 +0000 |
commit | ce72e83a39611733df05dae4ae7cabc7dc7f81d4 (patch) | |
tree | e9d8a959954bec30b9ce84b87ab08018bf3726f5 | |
parent | 0f2b43fddc18b301f3621a5e4314c0dcdb615eb1 (diff) |
Merged revisions 39056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r39056 | file | 2006-08-06 20:15:51 -0400 (Sun, 06 Aug 2006) | 2 lines
Reset our stream and vstream pointers back to NULL so that any generator that uses them (file based MOH) will not try to close them again. (issue #7668 reported by jmls)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channel.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1502,10 +1502,16 @@ int ast_hangup(struct ast_channel *chan) return 0; } free_translation(chan); - if (chan->stream) /* Close audio stream */ + /* Close audio stream */ + if (chan->stream) { ast_closestream(chan->stream); - if (chan->vstream) /* Close video stream */ + chan->stream = NULL; + } + /* Close video stream */ + if (chan->vstream) { ast_closestream(chan->vstream); + chan->vstream = NULL; + } if (chan->sched) { sched_context_destroy(chan->sched); chan->sched = NULL; |