From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 1 Dec 2010 00:28:16 +0000 (+0000)
Subject: Merged revisions 296869 via svnmerge from
X-Git-Tag: 1.8.2-rc1~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38b81d27724a625497f31526fa999eb6226d0d93;p=thirdparty%2Fasterisk.git

Merged revisions 296869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r296869 | jpeeler | 2010-11-30 18:24:58 -0600 (Tue, 30 Nov 2010) | 11 lines

  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.8@296870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c0ac2e8ce0..69777f8aa6 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -7229,6 +7229,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 */