From 20cf8d14fc3304c274121192c11fa8a36e40d8c8 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 17 Feb 2013 10:11:20 +0200 Subject: [PATCH] maildir: Don't try to preserve old filename when saving if uidlist couldn't be locked. --- src/lib-storage/index/maildir/maildir-save.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c index 606272f2d6..c5c9b2c1ad 100644 --- a/src/lib-storage/index/maildir/maildir-save.c +++ b/src/lib-storage/index/maildir/maildir-save.c @@ -818,12 +818,13 @@ maildir_filename_check_conflicts(struct maildir_save_context *ctx, { uoff_t size; - if (!ctx->locked_uidlist_refresh) { + if (!ctx->locked_uidlist_refresh && ctx->locked) { (void)maildir_uidlist_refresh(ctx->mbox->uidlist); ctx->locked_uidlist_refresh = TRUE; } - if ((prev_mf != NULL && maildir_filename_has_conflict(mf, prev_mf)) || + if (!ctx->locked_uidlist_refresh || + (prev_mf != NULL && maildir_filename_has_conflict(mf, prev_mf)) || maildir_uidlist_get_full_filename(ctx->mbox->uidlist, mf->dest_basename) != NULL) { /* file already exists. give it another name. -- 2.47.3