[asterisk-commits] file: trunk r39057 - in /trunk: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sun Aug  6 19:17:12 2006
New Revision: 39057

URL: http://svn.digium.com/view/asterisk?rev=39057&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=39057&r1=39056&r2=39057&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Sun Aug  6 19:17:12 2006
@@ -1502,10 +1502,16 @@
 		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;