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 6bbfc60ab1666775ea2184f4cdf13f1d37d1cfb0..1e65abc6f6927ff8100a5f5abc76c40e2e139b17 100644 (file)
--- 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: