diff options
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) |