probable fix for bug 4136 'Quick search throws bad command argument error 11 on Micro...

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index 3dd51740d8c08147aaee2082bfcaf8a7043f9ab8..7e956bf2446d9b458276424baa7ac3d1b4683de1 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2498,15 +2498,11 @@ 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);
-               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) {
+               return folder_item_search_msgs_local(folder, container, msgs, NULL,
+                                                      predicate, progress_cb, progress_data);
+       } 
+       
+       if (result == MAILIMAP_NO_ERROR) {
                gint result = 0;
 
                *msgs = imap_uid_list_from_lep(uidlist, &result);