From: BJ Weschke <bweschke@btwtech.com>
Date: Mon, 1 May 2006 19:32:47 +0000 (+0000)
Subject: Merged revisions 23985 via svnmerge from
X-Git-Tag: 1.4.0-beta1~1645
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=649052f980ed6b7afc8d4ca107a74130b6cdaa2b;p=thirdparty%2Fasterisk.git

Merged revisions 23985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r23985 | bweschke | 2006-05-01 14:26:43 -0500 (Mon, 01 May 2006) | 3 lines

 Make sure that when someone 0's out while recording a msg and then chooses to DELETE the recorded file, the .txt file isn't left around by itself to cause problems later. #7061 (dimitripietro reporting, blitzrage confirmed)


........


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ec9ded7900..724ba5d165 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2565,9 +2565,14 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
 				ast_log(LOG_WARNING, "Error opening text file for output\n");
 			res = play_record_review(chan, NULL, fn, vmmaxmessage, fmt, 1, vmu, &duration, dir, options->record_gain);
 			if (res == '0') {
-				if (txt) {
+				if (txt && EXISTS(dir,msgnum,fn,chan->language)) {
 					fclose(txt);
 					rename(tmptxtfile, txtfile);
+				} else if (!EXISTS(dir,msgnum,fn,chan->language)) {
+					if (option_debug) 
+						ast_log(LOG_DEBUG, "The recorded media file is gone, so we should remove the .txt file too!\n");
+					fclose(txt);
+					unlink(tmptxtfile);	
 				}
 				goto transfer;
 			}