aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-08 23:51:44 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-08 23:51:44 +0000
commitbeba4c9ca63e2137abd7b0fcb52121414b33a391 (patch)
tree27ed1a721c33115bfd73d70742cde7a821f8238b
parent43bc6044d7e13e695d165e7cafc6538164a4755a (diff)
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) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@245627 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 881f33f35..53d6b5e75 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6176,14 +6176,6 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
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)) {
@@ -6231,11 +6223,6 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
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);
- }
- }
}
}