automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39080 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index 738c6581b86ddb23cef52bdc6c45b80b0bd49f4a..26e5e05ba3ce26054341b21ed57684d17721538e 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -1307,10 +1307,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;