automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · d2cbfe3d21
parent b45cbc48f2
commit d2cbfe3d21
1 changed files with 1 additions and 0 deletions
--- 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: