Merge branch 'release'

diff --git a/notmuch-show.c b/notmuch-show.c
index dbb1efb97f5954438d6d274f8bc5b7fb9cfb68c9..912999e1a65e645b7b893ac49d1df55ad197d51c 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -708,6 +708,9 @@ format_part_end_json (GMimeObject *part)
 static void
 format_part_content_raw (GMimeObject *part)
 {
+    if (! GMIME_IS_PART (part))
+       return;
+
     GMimeStream *stream_stdout;
     GMimeStream *stream_filter = NULL;
     GMimeDataWrapper *wrapper;