automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-02 20:07:59 +00:00
parent d46854d378
commit 95c0040574

5
file.c
View File

@@ -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);
}