From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 17 Jan 2018 13:02:09 +0000 (+0200)
Subject: lib-imap-client: Fix reason text when unselecting mailbox aborts commands
X-Git-Tag: 2.2.34~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6c70c7f0195e723527d90d1b9b65d433e55121e;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-client: Fix reason text when unselecting mailbox aborts commands
---

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 736476cd29..4dbb69637b 100644
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -338,8 +338,13 @@ void imapc_connection_abort_commands(struct imapc_connection *conn,
 	   callback recurses us back here we don't crash */
 	i_zero(&reply);
 	reply.state = IMAPC_COMMAND_STATE_DISCONNECTED;
-	reply.text_without_resp = reply.text_full =
-		"Disconnected from server";
+	if (only_box != NULL) {
+		reply.text_without_resp = reply.text_full =
+			"Unselecting mailbox";
+	} else {
+		reply.text_without_resp = reply.text_full =
+			"Disconnected from server";
+	}
 	array_foreach(&tmp_array, cmdp) {
 		cmd = *cmdp;