From: Carl Worth <cworth@cworth.org>
Date: Tue, 27 Oct 2009 19:00:58 +0000 (-0700)
Subject: Unbreak the "notmuch setup" command.
X-Git-Tag: 0.1~679^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16003e1f8f22a4a1e2a63c89941565ae1a7b320b;p=notmuch.git

Unbreak the "notmuch setup" command.

The recent addition of support for automatically adding tags to
new messages for "notmuch new" caused "notmuch setup" to segfault.
The fix is simple, (just need to move a destroy function to inside
a nearby if block).

Did I mention recently we need to add a test suite?
---

diff --git a/notmuch.c b/notmuch.c
index f620f58d..ca30b521 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -264,9 +264,10 @@ add_files_recursive (notmuch_database_t *notmuch,
 		    /* success */
 		    case NOTMUCH_STATUS_SUCCESS:
 			state->added_messages++;
-			if (state->callback)
+			if (state->callback) {
 			    (state->callback) (message);
-			notmuch_message_destroy (message);
+			    notmuch_message_destroy (message);
+			}
 			break;
 		    /* Non-fatal issues (go on to next file) */
 		    case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: