From: Timo Sirainen <tss@iki.fi>
Date: Sat, 29 Nov 2008 21:15:24 +0000 (+0200)
Subject: Fixed searching in virtual mailboxes.
X-Git-Tag: 1.2.alpha5~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b0e91d0e48374c7ad23d58ed07070858f6ac086;p=thirdparty%2Fdovecot%2Fcore.git

Fixed searching in virtual mailboxes.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index c2fa1b5e7c..de1c360e70 100644
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -1163,6 +1163,7 @@ int index_storage_search_next_nonblock(struct mail_search_context *_ctx,
 {
         struct index_search_context *ctx = (struct index_search_context *)_ctx;
 	struct mailbox *box = _ctx->transaction->box;
+	struct mail_private *mail_private = (struct mail_private *)mail;
 	unsigned int count = 0;
 	bool match = FALSE;
 
@@ -1177,7 +1178,6 @@ int index_storage_search_next_nonblock(struct mail_search_context *_ctx,
 	}
 
 	ctx->mail = mail;
-	ctx->imail = ((struct mail_private *)mail)->v.get_index_mail(mail);
 
 	if (ioloop_time - ctx->last_notify.tv_sec >=
 	    SEARCH_NOTIFY_INTERVAL_SECS)
@@ -1185,6 +1185,7 @@ int index_storage_search_next_nonblock(struct mail_search_context *_ctx,
 
 	while (box->v.search_next_update_seq(_ctx)) {
 		mail_set_seq(mail, _ctx->seq);
+		ctx->imail = mail_private->v.get_index_mail(mail);
 
 		T_BEGIN {
 			match = search_match_next(ctx);