talons

commit f555c46566d1f030e25fe8b98cda4a69b5224723
parent 5f3de22a46d6316a25ae1196fb99796a88bdcb6c
Author: Paul <paul@claws-mail.org>
Date:   Thu, 14 May 2020 12:53:05 +0100

revert last commit, it's not needed

Diffstat:
M
src/imap.c
 | 
14
+++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/imap.c b/src/imap.c
@@ -2498,11 +2498,15 @@ static gint	search_msgs		(Folder			*folder,
 	if (result == MAILIMAP_ERROR_PROTOCOL) {
 		debug_print("Server side search unavailable, using local search\n");
 		imap_handle_error(SESSION(session), NULL, result);
-		return folder_item_search_msgs_local(folder, container, msgs, NULL,
-						       predicate, progress_cb, progress_data);
-	} 
-	
-	if (result == MAILIMAP_NO_ERROR) {
+		result = folder_item_search_msgs_local(folder, container, msgs,				    NULL, predicate, progress_cb, progress_data);
+		if (result < 0) {
+			debug_print("search_msgs - got protocol error, aborting\n");
+			alertpanel_error_log(_("Search failed due to server error."));
+			return -1;
+		}
+
+		return result;
+	} if (result == MAILIMAP_NO_ERROR) {
 		gint result = 0;
 
 		*msgs = imap_uid_list_from_lep(uidlist, &result);