From caac1f532690ce932c653e647b5006cce80f4f9f Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Tue, 27 Jan 2009 12:17:23 -0800 Subject: [PATCH] IMAP: only close socket when not already disconnected. --- ChangeLog | 11 ++++++++--- imap/imap.c | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63636fc57..9d61e4ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,17 @@ -2009-01-27 15:25 +0100 Rocco Rutte (eb918af802ec) +2009-01-27 18:48 +0100 Rocco Rutte (d7e44862a08a) + + * help.c, main.c, mh.c: Update copyright years + + * help.c: Fix help alignment for escape sequences at screen + boundary. Closes #3146. * mh.c: Unconditionally inode-sort Maildir and MH folders. Closes #3166. 2009-01-26 12:32 -0800 Brendan Cully (da94a92c3ba0) - * ChangeLog, bcache.c: Remove old bcache tmpfile before trying to - create new one. Closes #3163. + * bcache.c: Remove old bcache tmpfile before trying to create new + one. Closes #3163. 2009-01-20 12:34 -0800 René Clerc (2006526d1d26) diff --git a/imap/imap.c b/imap/imap.c index e5cb67544..c7b451bd8 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -488,8 +488,11 @@ int imap_open_connection (IMAP_DATA* idata) void imap_close_connection(IMAP_DATA* idata) { - mutt_socket_close (idata->conn); - idata->state = IMAP_DISCONNECTED; + if (idata->state != IMAP_DISCONNECTED) + { + mutt_socket_close (idata->conn); + idata->state = IMAP_DISCONNECTED; + } idata->seqno = idata->nextcmd = idata->lastcmd = idata->status = 0; memset (idata->cmds, 0, sizeof (IMAP_COMMAND) * idata->cmdslots); } -- 2.40.0