automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · e9b9632fef
parent 1308ebf409
commit e9b9632fef
1 changed files with 1 additions and 1 deletions
--- a/channel.c
+++ b/channel.c
@ -2476,7 +2476,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
 						state = f->subclass;
 						ast_frfree(f);
 						break;
-					} else if (f->subclass == AST_CONTROL_PROGRESS) {
+					} else if (f->subclass == AST_CONTROL_PROGRESS || f->subclass == AST_CONTROL_PROCEEDING) {
 						/* Ignore */
 					} else if (f->subclass == -1) {
 						/* Ignore -- just stopping indications */