X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=fa54de662aa7e5c6c3f7496e7faf67086e148fa0;hp=e60cd8cb382b432c49991aaa947f2aa7cc871559;hb=ee7304bbd0adad226577ac819360bfcb5326d77b;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed

diff --git a/imap/util.c b/imap/util.c
index e60cd8c..fa54de6 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -99,7 +99,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   url_parse_ciss (&url, c);
 
   if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
-      mutt_account_fromurl (&mx->account, &url) < 0) {
+      mutt_account_fromurl (&mx->account, &url) < 0 || !*mx->account.host) {
     mem_free (&c);
     return -1;
   }
@@ -516,9 +516,11 @@ int imap_wait_keepalive (pid_t pid)
   int rc;
 
   short imap_passive = option (OPTIMAPPASSIVE);
+  int imap_askreconnect = quadoption (OPT_IMAPRECONNECT);
 
   set_option (OPTIMAPPASSIVE);
   set_option (OPTKEEPQUIET);
+  set_quadoption (OPT_IMAPRECONNECT, M_NO);
 
   sigprocmask (SIG_SETMASK, NULL, &oldmask);
 
@@ -547,6 +549,7 @@ int imap_wait_keepalive (pid_t pid)
   unset_option (OPTKEEPQUIET);
   if (!imap_passive)
     unset_option (OPTIMAPPASSIVE);
+  set_quadoption (OPT_IMAPRECONNECT, imap_askreconnect);
 
   return rc;
 }