From: Automerge script Date: Tue, 2 May 2006 20:07:59 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.8-netsec~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c004057485bc8c21fd8b04a502ea2ce0cf14df;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24338 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/file.c b/file.c index 76bf9a12ab..76d848f793 100644 --- a/file.c +++ b/file.c @@ -184,10 +184,13 @@ int ast_format_unregister(const char *name) int ast_stopstream(struct ast_channel *tmp) { /* Stop a running stream if there is one */ - if (tmp->vstream) + if (tmp->vstream) { ast_closestream(tmp->vstream); + tmp->vstream = NULL; + } if (tmp->stream) { ast_closestream(tmp->stream); + tmp->stream = NULL; if (tmp->oldwriteformat && ast_set_write_format(tmp, tmp->oldwriteformat)) ast_log(LOG_WARNING, "Unable to restore format back to %d\n", tmp->oldwriteformat); }