Rocco Rutte:

- include patch #938 to fix bug #6459

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@796 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index 114370f..0d1dc8d 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-795
+796

diff --git a/imap/util.c b/imap/util.c
index a55168a..fa54de6 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -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;
 }