From 5c539c85e839f04f8b5e657000525faea275ea1b Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Sun, 13 Dec 1998 08:10:12 +0000
Subject: [PATCH] Don't dump core when closing a NULL context.  Fixes the "exit
 from no-mailbox mode" bug.

---
 curs_main.c | 7 +++++--
 mx.c        | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/curs_main.c b/curs_main.c
index c0d88404e..7c0013679 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -972,8 +972,11 @@ int mutt_index_menu (void)
 	    && (query_quadoption (OPT_QUIT, 
 				  _("Exit Mutt without saving?")) == M_YES))
 	{
-	  mx_fastclose_mailbox (Context);
-	  safe_free ((void **) &Context);
+	  if (Context)
+	  {
+	    mx_fastclose_mailbox (Context);
+	    safe_free ((void **) &Context);
+	  }
 	  done = 1;
 	}
 	break;
diff --git a/mx.c b/mx.c
index ddf0d6fc5..93c917fe6 100644
--- a/mx.c
+++ b/mx.c
@@ -642,6 +642,9 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
 void mx_fastclose_mailbox (CONTEXT *ctx)
 {
   int i;
+
+  if(!ctx) 
+    return;
   
 #ifdef USE_IMAP
   if (ctx->magic == M_IMAP)
@@ -712,6 +715,8 @@ int mx_close_mailbox (CONTEXT *ctx)
   char mbox[_POSIX_PATH_MAX];
   char buf[SHORT_STRING];
 
+  if (!ctx) return 0;
+
   ctx->closing = 1;
 
   if (ctx->readonly || ctx->dontwrite)
-- 
2.40.0