From: Automerge Script <automerge@asterisk.org>
Date: Sun, 8 Apr 2007 02:56:53 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.18-netsec~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2e94e498bde5050e86202f7c49a6fd6b4f7146;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/file.c b/file.c
index 1067f7ff35..15734ecd2e 100644
--- a/file.c
+++ b/file.c
@@ -427,10 +427,15 @@ static int ast_filehelper(const char *filename, const char *filename2, const cha
 										s->fmt = f;
 										s->trans = NULL;
 										s->filename = NULL;
-										if (s->fmt->format < AST_FORMAT_MAX_AUDIO)
+										if (s->fmt->format < AST_FORMAT_MAX_AUDIO) {
+											if (chan->stream)
+												ast_closestream(chan->stream);
 											chan->stream = s;
-										else
+										} else {
+											if (chan->vstream)
+												ast_closestream(chan->vstream);
 											chan->vstream = s;
+										}
 									} else {
 										fclose(bfile);
 										ast_log(LOG_WARNING, "Unable to open file on %s\n", fn);