diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 76b2805395b1187ad0521a0c33ca570c75bf80d5..9bcb8f1596fab3e8cce68c678295eb9a84701f71 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -222,6 +222,7 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate); #define VM_TEMPGREETWARN (1 << 15) /*!< Remind user tempgreeting is set */ #define VM_MOVEHEARD (1 << 16) /*!< Move a "heard" message to Old after listening to it */ #define ERROR_LOCK_PATH -100 +#define ERROR_MAILBOX_FULL -200 enum { @@ -3522,7 +3523,7 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg } else { if (x >= vmu->maxmsg) { ast_unlock_path(ddir); - return -1; + return ERROR_MAILBOX_FULL; } } make_file(sfn, sizeof(sfn), dir, msg); @@ -5336,8 +5337,9 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu) } else if (!strcasecmp(vms->curbox, "INBOX") && 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); - if (res == ERROR_LOCK_PATH) { + if (res == ERROR_LOCK_PATH || res == ERROR_MAILBOX_FULL) { /* If save failed do not delete the message */ + ast_log(LOG_WARNING, "Save failed. Not moving message: %s.\n", res == ERROR_LOCK_PATH ? "unable to lock path" : "destination folder full"); vms->deleted[x] = 0; vms->heard[x] = 0; --x;