From d6332f3cc841a2a402adb0f12c82a11f691ef8fa Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Thu, 20 Dec 2012 23:37:04 +0200
Subject: [PATCH] * mu-query: minor updates

---
 lib/mu-query.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/mu-query.cc b/lib/mu-query.cc
index 84c75cbc..a5f9674a 100644
--- a/lib/mu-query.cc
+++ b/lib/mu-query.cc
@@ -412,18 +412,19 @@ mu_query_run (MuQuery *self, const char* searchexpr, MuMsgFieldId sortfieldid,
 			      NULL);
 	try {
 		MuMsgIter *iter;
-		Xapian::Enquire enq (get_enquire(self, searchexpr, sortfieldid, flags,
-						 err));
+		Xapian::Enquire enq (get_enquire(self, searchexpr, sortfieldid,
+						 flags, err));
 
 		/* get the 'real' maxnum if it was specified as < 0 */
-		maxnum <= 0 ? self->db().get_doccount() : maxnum;
+		maxnum = maxnum <= 0 ? self->db().get_doccount() : maxnum;
 
 		iter = mu_msg_iter_new (
 			reinterpret_cast<XapianEnquire*>(&enq),
 			maxnum,
 			/* in we were *not* using threads, no further sorting
 			 * is needed since Xapian already sorted */
-			(flags & MU_QUERY_FLAG_THREADS) ? sortfieldid : MU_MSG_FIELD_ID_NONE,
+			(flags & MU_QUERY_FLAG_THREADS)
+			? sortfieldid : MU_MSG_FIELD_ID_NONE,
 			msg_iter_flags (flags),
 			err);