notmuch_query_search_threads: Avoid returning more threads than asked for.

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index 1777e47dc044daa339c7ec0988e3d0fbef3de5a9..381529b538c270695144d4aef8ae7ba673dee996 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -200,7 +200,7 @@ notmuch_query_search_threads (notmuch_query_t *query,
     seen = g_hash_table_new_full (g_str_hash, g_str_equal,
                                  free, NULL);
 
-    while (threads_seen < first + max_threads)
+    while (max_threads < 0 || threads_seen < first + max_threads)
     {
        int messages_seen_previously = messages_seen;
 
@@ -218,7 +218,7 @@ notmuch_query_search_threads (notmuch_query_t *query,
                                                thread_id, NULL,
                                                (void **) &thread))
            {
-               if (threads_seen > first) {
+               if (threads_seen >= first) {
                    thread = _notmuch_thread_create (query, query->notmuch,
                                                     thread_id);
                    g_ptr_array_add (threads->threads, thread);
@@ -237,6 +237,9 @@ notmuch_query_search_threads (notmuch_query_t *query,
            notmuch_message_destroy (message);
 
            messages_seen++;
+
+           if (max_threads >= 0 && threads_seen >= first + max_threads)
+               break;
        }
 
        /* Stop if we're not seeing any more messages. */