summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-09-01 16:34:57 +0000
committerJoshua Colp <jcolp@digium.com>2006-09-01 16:34:57 +0000
commit9edf55b64defe4860ac9e60ec88bbe64780e6995 (patch)
treef3db0ccf7bf4e06f231bcef91f5ed8a3cb19796a /main
parent2ff2b02eaeb27d8e71f5c2a164f986cfc824dd9c (diff)
Merged revisions 41690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r41690 | file | 2006-09-01 12:28:08 -0400 (Fri, 01 Sep 2006) | 2 lines Don't treat an unexpected control subclass as voice (issue #7858 reported by PCadach) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 16d89d661..5a4080c5c 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1862,7 +1862,9 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
break;
default:
ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", f->subclass);
+ break;
}
+ break;
case AST_FRAME_VOICE:
/* Write audio if appropriate */
if (audiofd > -1)