[svn-commits] sgriepentrog: branch 11 r434260 - /branches/11/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Tue Apr  7 14:34:35 2015
New Revision: 434260

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434260
Log:
Voicemail API: fix handling of full mailbox

Changes to an error code in svn r115582 was
the accidental cause of message deletion on
a full (by maxmsg) Old mailbox folder.

This restores the original handling marking
the message to be left in the Inbox.

ASTERISK-24942 #close
Review: https://reviewboard.asterisk.org/r/4595/


Modified:
    branches/11/apps/app_voicemail.c

Modified: branches/11/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_voicemail.c?view=diff&rev=434260&r1=434259&r2=434260
==============================================================================
--- branches/11/apps/app_voicemail.c (original)
+++ branches/11/apps/app_voicemail.c Tue Apr  7 14:34:35 2015
@@ -8802,7 +8802,7 @@
 		} else if ((!strcasecmp(vms->curbox, "INBOX") || !strcasecmp(vms->curbox, "Urgent")) && vms->heard[x] && ast_test_flag(vmu, VM_MOVEHEARD) && !vms->deleted[x]) {
 			/* Move to old folder before deleting */
 			res = save_to_folder(vmu, vms, x, 1, NULL, 0);
-			if (res == ERROR_LOCK_PATH) {
+			if (res) {
 				/* If save failed do not delete the message */
 				ast_log(AST_LOG_WARNING, "Save failed.  Not moving message: %s.\n", res == ERROR_LOCK_PATH ? "unable to lock path" : "destination folder full");
 				vms->deleted[x] = 0;
@@ -8812,7 +8812,7 @@
 		} else if (vms->deleted[x] && vmu->maxdeletedmsg) {
 			/* Move to deleted folder */
 			res = save_to_folder(vmu, vms, x, 10, NULL, 0);
-			if (res == ERROR_LOCK_PATH) {
+			if (res) {
 				/* If save failed do not delete the message */
 				vms->deleted[x] = 0;
 				vms->heard[x] = 0;