diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-07-27 16:08:10 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-07-27 16:08:10 +0000 |
| commit | 8bd241f2382979e65f127775e133b7707739a1f2 (patch) | |
| tree | 5ad66c7a9716e2647816434931f26a9f8dd5a542 /main/channel.c | |
| parent | 805082efd4c9c3e528b28f118978a3c83c562dcc (diff) | |
Merged revisions 279636,279815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r279636 | russell | 2010-07-26 16:53:30 -0500 (Mon, 26 Jul 2010) | 2 lines
Ignore a control subclass of -1 in ast_waitfordigit_full().
........
r279815 | russell | 2010-07-27 11:06:58 -0500 (Tue, 27 Jul 2010) | 4 lines
Support "channels" in addition to "channel" in chan_dahdi.conf.
Review: https://reviewboard.asterisk.org/r/804
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 175f9d19f..00f3f7863 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3429,6 +3429,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd) case AST_CONTROL_SRCCHANGE: case AST_CONTROL_CONNECTED_LINE: case AST_CONTROL_REDIRECTING: + case -1: /* Unimportant */ break; default: |