From e60b711ac3e45b375710a587b08d5648de341fa9 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@gahr.ch>
Date: Fri, 21 Sep 2018 12:15:26 +0000
Subject: [PATCH] Fix segfault when checking a mailbox after a disconnect (II)

---
 curs_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curs_main.c b/curs_main.c
index 90cba585e..505ca82ee 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1049,7 +1049,7 @@ int mutt_index_menu(void)
       check = mx_mbox_check(Context, &index_hint);
       if (check < 0)
       {
-        if (Context->mailbox->path[0] == '\0')
+        if (!Context->mailbox || Context->mailbox->path[0] == '\0')
         {
           /* fatal error occurred */
           mutt_context_free(&Context);
-- 
2.40.0