automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44515 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 0 deletions

diff --git a/file.c b/file.c
index 6bbfc60ab..1e65abc6f 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: