From 22bcf4e91d1fc4b042fcd9e769d82d957d9ea710 Mon Sep 17 00:00:00 2001
From: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
Date: Thu, 23 Jun 2022 22:59:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E4=B8=80=E4=B8=8B=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/AutoRecruitTask.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index 33eb3716c8..ac5bfc0ed8 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -196,6 +196,15 @@ bool asst::AutoRecruitTask::calc_and_recruit()
             return false;
         }
 
+        if (!(m_skip_robot && has_robot_tag) && std::find(m_confirm_level.cbegin(), m_confirm_level.cend(), maybe_level) != m_confirm_level.cend()) {
+            if (!confirm()) {
+                return false;
+            }
+        }
+        else {
+            click_return_button();
+        }
+
         break;
     }
 
@@ -209,21 +218,14 @@ bool asst::AutoRecruitTask::calc_and_recruit()
         };
         callback(AsstMsg::SubTaskError, info);
         click_return_button();
-        return true;
+    }
+    // 正常结束了 callback 一下，避免有的用户觉得自己的 Tags 被刷新了
+    else {
+        json::value info = basic_info();
+        info["what"] = "RecruitSlotCompleted";
+        callback(AsstMsg::SubTaskExtraInfo, info);
     }
 
-    if (!(m_skip_robot && has_robot_tag) && std::find(m_confirm_level.cbegin(), m_confirm_level.cend(), maybe_level) != m_confirm_level.cend()) {
-        if (!confirm()) {
-            return false;
-        }
-    }
-    else {
-        click_return_button();
-    }
-    // 一个公招槽位结束了 callback 一下，避免有的用户觉得自己的 Tags 被刷新了
-    json::value info = basic_info();
-    info["what"] = "RecruitSlotCompleted";
-    callback(AsstMsg::SubTaskExtraInfo, info);
     return true;
 }