diff options
| author | Jason Parker <jparker@digium.com> | 2008-04-15 20:27:04 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-04-15 20:27:04 +0000 |
| commit | fe65716e15cbb013a0b6b85c361f93c45a9d7c92 (patch) | |
| tree | 4a6d7f20937a8f4f98c5793e58707a032a65e739 /apps | |
| parent | 5b4222c9de46d27c7998b2b38c83622017698344 (diff) | |
If somebody enters a digit during ast_stream_and_wait, the return value is the digit, which we need to use later.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_directory.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 03f8dbbe2..981e1f1de 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -858,14 +858,23 @@ static int directory_exec(struct ast_channel *chan, void *data) if (!ast_strlen_zero(dirintro) && !res) { res = ast_stream_and_wait(chan, dirintro, AST_DIGIT_ANY); } else if (!res) { - res = ast_stream_and_wait(chan, "dir-welcome", AST_DIGIT_ANY) || - ast_stream_and_wait(chan, "dir-pls-enter", AST_DIGIT_ANY) || - ast_stream_and_wait(chan, digits, AST_DIGIT_ANY) || - ast_stream_and_wait(chan, + /* Stop playing sounds as soon as we have a digit. */ + res = ast_stream_and_wait(chan, "dir-welcome", AST_DIGIT_ANY); + if (!res) { + res = ast_stream_and_wait(chan, "dir-pls-enter", AST_DIGIT_ANY); + } + if (!res) { + res = ast_stream_and_wait(chan, digits, AST_DIGIT_ANY); + } + if (!res) { + res = ast_stream_and_wait(chan, which == FIRST ? "dir-first" : which == LAST ? "dir-last" : - "dir-firstlast", AST_DIGIT_ANY) || + "dir-firstlast", AST_DIGIT_ANY); + } + if (!res) { ast_stream_and_wait(chan, "dir-usingkeypad", AST_DIGIT_ANY); + } } ast_stopstream(chan); if (!res) |