From: Automerge script <automerge@asterisk.org>
Date: Thu, 5 Oct 2006 20:02:26 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2cbfe3d21a7ab0ea80cec9cee486dc0c5eceecf;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/file.c b/file.c
index 6bbfc60ab1..1e65abc6f6 100644
--- a/file.c
+++ b/file.c
@@ -1028,6 +1028,7 @@ int ast_waitstream(struct ast_channel *c, const char *breakon)
 			case AST_FRAME_CONTROL:
 				switch(fr->subclass) {
 				case AST_CONTROL_HANGUP:
+				case AST_CONTROL_BUSY:
 					ast_frfree(fr);
 					return -1;
 				case AST_CONTROL_RINGING: