[asterisk-commits] tilghman: branch 1.4 r218331 - in /branches/1.4: apps/ sounds/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Sep 14 14:16:35 2009
New Revision: 218331

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218331
Log:
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

Modified:
    branches/1.4/apps/app_voicemail.c
    branches/1.4/sounds/Makefile

Modified: branches/1.4/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=218331&r1=218330&r2=218331
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Mon Sep 14 14:16:35 2009
@@ -6861,6 +6861,9 @@
 		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 @@
 			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)) 

Modified: branches/1.4/sounds/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/sounds/Makefile?view=diff&rev=218331&r1=218330&r2=218331
==============================================================================
--- branches/1.4/sounds/Makefile (original)
+++ branches/1.4/sounds/Makefile Mon Sep 14 14:16:35 2009
@@ -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))