[asterisk-commits] qwell: branch 1.6.0 r245627 - /branches/1.6.0/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Feb  8 17:51:44 2010
New Revision: 245627

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=245627
Log:
Stop playing the message number multiple times.

Also remove some accidentally duplicated code, which may have been causing a memleak.
This was caused by a bad merge.

(closes issue #16579)
Reported by: kue
Patches: 
      0016525.patch uploaded by hokie21 (license 987)

Modified:
    branches/1.6.0/apps/app_voicemail.c

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=245627&r1=245626&r2=245627
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Mon Feb  8 17:51:44 2010
@@ -6176,14 +6176,6 @@
 	else if (vms->curmsg == vms->lastmsg)
 		res = wait_file2(chan, vms, "vm-last");		/* "last" */
 
-	snprintf(filename, sizeof(filename), "%s.txt", vms->fn);
-	RETRIEVE(vms->curdir, vms->curmsg, vmu->mailbox, vmu->context);
-	msg_cfg = ast_config_load(filename, config_flags);
-	if (!msg_cfg) {
-		ast_log(LOG_WARNING, "No message attribute file?!! (%s)\n", filename);
-		return 0;
-	}
-
 	/* POLISH syntax */
 	if (!strncasecmp(chan->language, "pl", 2)) {
 		if (vms->curmsg && (vms->curmsg != vms->lastmsg)) {
@@ -6230,11 +6222,6 @@
 		if (vms->curmsg && (vms->curmsg != vms->lastmsg)) {
 			if (!res) {
 				res = ast_say_number(chan, vms->curmsg + 1, AST_DIGIT_ANY, chan->language, NULL);
-			}
-			if (vms->curmsg && (vms->curmsg != vms->lastmsg)) {
-				if (!res) {
-					res = ast_say_number(chan, vms->curmsg + 1, AST_DIGIT_ANY, chan->language, NULL);
-				}
 			}
 		}
 	}