X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=cb720cc2f9a76d36fd8a4194fd9d9dc07f3029f5;hp=3ff630478c613848f342ddbdb42fa625484254d0;hb=3a32aa6bdb193894016078d2832ee9eaaa01c27f;hpb=6f7469f54744656f90ce215f365d5731e16acd3c

diff --git a/notmuch-new.c b/notmuch-new.c
index 3ff63047..cb720cc2 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -900,12 +900,12 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	    return 1;
 
 	printf ("Found %d total files (that's not much mail).\n", count);
-	notmuch = notmuch_database_create (db_path);
+	if (notmuch_database_create (db_path, &notmuch))
+	    return 1;
 	add_files_state.total_files = count;
     } else {
-	notmuch = notmuch_database_open (db_path,
-					 NOTMUCH_DATABASE_MODE_READ_WRITE);
-	if (notmuch == NULL)
+	if (notmuch_database_open (db_path, NOTMUCH_DATABASE_MODE_READ_WRITE,
+				   &notmuch))
 	    return 1;
 
 	if (notmuch_database_needs_upgrade (notmuch)) {