From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 8 Feb 2011 19:25:10 +0000 (+0000)
Subject: Merged revisions 306960 via svnmerge from
X-Git-Tag: 1.6.2.18-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06bdfcedd902dea83d19dd12b62e0324f7f2541e;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@306961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 504794bfd0..195f1e0c1b 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6505,14 +6505,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)