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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index aab22ae96b6061be9cb5f0ecf3feec30274ff6ef..8cce2d3f62e1a41942428aec9a6f83eb7a4ea84a 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6777,14 +6777,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)