fix: crash in vfolder-from-query

see #746

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 65c74eb48cfe56847cb60bb9ac5f5421a6a06304..4cc06aa3a1ea357cabef17d15bee9dc0f942ebb8 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -457,7 +457,7 @@ static enum NmQueryType string_to_query_type(const char *str)
   else if (mutt_strcmp(str, "messages") == 0)
     return NM_QUERY_TYPE_MESGS;
 
-  mutt_error(_("failed to parse notmuch query type: %s"), str);
+  mutt_error(_("failed to parse notmuch query type: %s"), NONULL(str));
   return NM_QUERY_TYPE_MESGS;
 }
 
@@ -1857,10 +1857,10 @@ char *nm_uri_from_query(struct Context *ctx, char *buf, size_t bufsz)
                      query_type_to_string(data->query_type));
   else if (NmDefaultUri)
     added = snprintf(uri, sizeof(uri), "%s?type=%s&query=", NmDefaultUri,
-                     query_type_to_string(data->query_type));
+                     query_type_to_string(string_to_query_type(NmQueryType)));
   else if (Folder)
     added = snprintf(uri, sizeof(uri), "notmuch://%s?type=%s&query=", Folder,
-                     query_type_to_string(data->query_type));
+                     query_type_to_string(string_to_query_type(NmQueryType)));
   else
     return NULL;