From: Joshua Colp <jcolp@digium.com>
Date: Mon, 7 Aug 2006 00:17:12 +0000 (+0000)
Subject: Merged revisions 39056 via svnmerge from
X-Git-Tag: 1.4.0-beta1~460
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce72e83a39611733df05dae4ae7cabc7dc7f81d4;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channel.c b/channel.c
index 972946690c..f2700b29ec 100644
--- a/channel.c
+++ b/channel.c
@@ -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;