X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fthread.cc;h=c8e58c336e46e6dcfc45a15bf78b7182643cb421;hb=65a6b86873a471bb87d30a8617a87857103cd8b6;hp=4c49f980c7b81ee5cb92198d68bf65b8173e8cba;hpb=0fc788460276f0e08c3ccae0a779f96125624a8d;p=notmuch

diff --git a/lib/thread.cc b/lib/thread.cc
index 4c49f980..c8e58c33 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -353,10 +353,8 @@ _thread_add_matched_message (notmuch_thread_t *thread,
 {
     time_t date;
     notmuch_message_t *hashed_message;
-    const char *cur_subject;
 
     date = notmuch_message_get_date (message);
-    cur_subject = notmuch_thread_get_subject(thread);
 
     if (date < thread->oldest || ! thread->matched_messages) {
 	thread->oldest = date;
@@ -366,6 +364,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,
 
     if (date > thread->newest || ! thread->matched_messages) {
 	thread->newest = date;
+	const char *cur_subject = notmuch_thread_get_subject(thread);
 	if (sort != NOTMUCH_SORT_OLDEST_FIRST || EMPTY_STRING(cur_subject))
 	    _thread_set_subject_from_message (thread, message);
     }
@@ -505,6 +504,8 @@ _notmuch_thread_create (void *ctx,
      * oldest or newest subject is desired. */
     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
+    /* XXX: this should use the _st version, but it needs an error path
+     */
     for (messages = notmuch_query_search_messages (thread_id_query);
 	 notmuch_messages_valid (messages);
 	 notmuch_messages_move_to_next (messages))