Skip to content

Commit 402da41

Browse files
committed
fix: 修复乱七八糟小问题
1 parent 4fa55b3 commit 402da41

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

source/MaaFramework/Task/Actuator.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ void Actuator::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv:
143143
while (true) {
144144
cv::Mat cur_image = controller()->screencap();
145145

146+
if (pre_image.empty() || cur_image.empty()) {
147+
LogError << "Image is empty" << VAR(pre_image.empty()) << VAR(cur_image.empty());
148+
break;
149+
}
150+
146151
auto ret = comp.analyze(pre_image, cur_image);
147152
if (ret.empty()) {
148153
pre_image = cur_image;

source/MaaFramework/Task/PipelineTask.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ std::optional<PipelineTask::HitResult>
129129

130130
cv::Mat image = controller()->screencap();
131131

132+
if (image.empty()) {
133+
LogError << "Image is empty";
134+
return std::nullopt;
135+
}
136+
132137
if (need_to_stop()) {
133138
LogInfo << "Task interrupted" << VAR(latest_hit_);
134139
return std::nullopt;
@@ -149,6 +154,7 @@ std::optional<PipelineTask::HitResult>
149154

150155
for (const std::string& name : list) {
151156
LogDebug << "recognize:" << name;
157+
152158
const auto& task_data = data_mgr_.get_task_data(name);
153159
if (!task_data.enabled) {
154160
LogDebug << "Task disabled:" << name;

source/MaaToolkit/Config/GlobalOptionConfig.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ bool GlobalOptionConfig::init(
3232
}
3333

3434
if (!std::filesystem::exists(config_path_)) {
35+
option_ = (Option)default_config;
3536
#ifdef MAA_DEBUG
3637
option_.stdout_level = MaaLoggingLevel_All;
3738
#endif
38-
option_ = (Option)default_config;
3939
save();
4040
}
4141

@@ -116,4 +116,4 @@ bool GlobalOptionConfig::save() const
116116
return true;
117117
}
118118

119-
MAA_TOOLKIT_NS_END
119+
MAA_TOOLKIT_NS_END

source/binding/Python/maa/instance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def _status(self, id: int) -> ctypes.c_int32:
181181
return Library.framework.MaaTaskStatus(self._handle, id)
182182

183183
def _stop_status(self, id: int) -> ctypes.c_int32:
184-
return MaaStatusEnum.success if self.running() else MaaStatusEnum.running
184+
return MaaStatusEnum.success if not self.running() else MaaStatusEnum.running
185185

186186
def _set_task_param(self, id: int, param: Dict) -> bool:
187187
return Library.framework.MaaSetTaskParam(

0 commit comments

Comments
 (0)