Merged revisions 296868 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r296868 | jpeeler | 2010-11-30 18:23:19 -0600 (Tue, 30 Nov 2010) | 4 lines

  Properly restore backup information file when hanging up during message prepending.

  ABE-2654
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@296869 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 73c4ee2e5a1d74551359881ac47a20c37e8d5c5a..c2f8f7f2ac4a59d1760b7dcac2af94019e59fdd4 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6950,6 +6950,16 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
 #endif
                }
                DISPOSE(dir, curmsg);
+#ifndef IMAP_STORAGE
+               if (cmd) { /* assuming hangup, cleanup backup file */
+                       make_file(msgfile, sizeof(msgfile), dir, curmsg);
+                       strcpy(textfile, msgfile);
+                       strcpy(backup_textfile, msgfile);
+                       strncat(textfile, ".txt", sizeof(textfile) - strlen(textfile) - 1);
+                       strncat(backup_textfile, "-bak.txt", sizeof(backup_textfile) - strlen(backup_textfile) - 1);
+                       rename(backup_textfile, textfile);
+               }
+#endif
        }
 
        /* If anything failed above, we still have this list to free */