diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 19:16:35 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 19:16:35 +0000 |
| commit | 4d40ee2f00f791fc3f11609a2e93badf322af1d0 (patch) | |
| tree | 778d96c6ed5fe45bb8462fb58e8f3e434a027b80 | |
| parent | 2210e74e334058eb8e54a006ba6a578906c3a185 (diff) | |
Don't say "Please try again" if we don't give the user another chance to try again.
(issue #15055, SWP-129)
Reported by: jthurman
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@218331 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 6 | ||||
| -rw-r--r-- | sounds/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2213f8855..796e8f52f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6861,6 +6861,9 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct cmd = ast_play_and_wait(chan, "vm-mismatch"); if (++tries == 3) return -1; + if (cmd == 0) { + cmd = ast_play_and_wait(chan, "vm-pls-try-again"); + } } if (ast_strlen_zero(ext_pass_cmd)) vm_change_password(vmu,newpassword); @@ -6970,6 +6973,9 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct if (strcmp(newpassword, newpassword2)) { ast_log(LOG_NOTICE,"Password mismatch for user %s (%s != %s)\n", vms->username, newpassword, newpassword2); cmd = ast_play_and_wait(chan, "vm-mismatch"); + if (!cmd) { + cmd = ast_play_and_wait(chan, "vm-pls-try-again"); + } break; } if (ast_strlen_zero(ext_pass_cmd)) diff --git a/sounds/Makefile b/sounds/Makefile index 4cd605108..fdb986d6d 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -18,7 +18,7 @@ PWD:=$(shell pwd) SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.15 +CORE_SOUNDS_VERSION:=1.4.16 EXTRA_SOUNDS_VERSION:=1.4.9 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) |