From bda2e7dbe63dcb841b73b61295bfc257cb5e641e Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 3 Dec 2021 10:59:20 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=85=AC=E6=8B=9B=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistance/AutoRecruitTask.cpp | 12 +++++++-----
 src/MeoAssistance/RecruitTask.cpp     |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/MeoAssistance/AutoRecruitTask.cpp b/src/MeoAssistance/AutoRecruitTask.cpp
index 7d8f75e9a1..6dee7a6478 100644
--- a/src/MeoAssistance/AutoRecruitTask.cpp
+++ b/src/MeoAssistance/AutoRecruitTask.cpp
@@ -43,16 +43,14 @@ bool asst::AutoRecruitTask::run()
         }
         Rect rect = start_res.at(i).rect;
         ctrler.click(rect);
-        sleep(delay);
+        sleep(delay);
+        bool ret = false;
         for (int j = 0; j != m_retry_times; ++j) {
             if (need_exit()) {
                 return false;
             }
-            bool ret = _run();
+            ret = _run();
             switch (m_last_error) {
-            case ErrorT::NotInTagsPage:
-                --i;
-                break;
             case ErrorT::NotInConfirm:
                 click_return_button();
                 break;
@@ -63,6 +61,10 @@ bool asst::AutoRecruitTask::run()
             if (ret) {
                 break;
             }
+        }
+        // 可能是Tag一直识别错误，那就算了，放弃这个
+        if (ret == false) {
+            click_return_button();
         }
     }
 
diff --git a/src/MeoAssistance/RecruitTask.cpp b/src/MeoAssistance/RecruitTask.cpp
index ca964ba8ff..49d85ceaac 100644
--- a/src/MeoAssistance/RecruitTask.cpp
+++ b/src/MeoAssistance/RecruitTask.cpp
@@ -225,7 +225,6 @@ bool RecruitTask::_run()
         }
         else {
             m_last_error = ErrorT::NotInConfirm;
-            return true;
         }
     }