diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-08 19:26:05 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-08 19:26:05 +0000 |
commit | fb853d079b952f15ddb11900071af814e7787652 (patch) | |
tree | d78103f2f1c3156a5382cfb2fd624dedee9f8c4a /apps/app_voicemail.c | |
parent | 924f99c3c423f4b6319c292bd6653db6a5c3546a (diff) |
Merged revisions 306962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r306962 | jpeeler | 2011-02-08 13:25:38 -0600 (Tue, 08 Feb 2011) | 22 lines
Merged revisions 306961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r306961 | jpeeler | 2011-02-08 13:25:10 -0600 (Tue, 08 Feb 2011) | 15 lines
Merged revisions 306960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r306960 | jpeeler | 2011-02-08 13:18:50 -0600 (Tue, 08 Feb 2011) | 9 lines
Backup file storing message duration is not used with IMAP_STORAGE, remove code.
The message duration is stored in the body of the email when using IMAP_STORAGE,
so nothing needs to happen with the backup file.
(closes issue #18718)
Reported by: kerframil
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306963 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
-rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 25fcb0935..8b26a60d8 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6767,14 +6767,16 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, } /* Back up the original file, so we can retry the prepend and restore it after forward. */ +#ifndef IMAP_STORAGE if (already_recorded) { ast_filecopy(backup, msgfile, NULL); copy(backup_textfile, textfile); } else { ast_filecopy(msgfile, backup, NULL); - copy(textfile,backup_textfile); + copy(textfile, backup_textfile); } +#endif already_recorded = 1; if (record_gain) |