mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-16 09:50:40 +08:00
Merge.合并v3.1.3
This commit is contained in:
@@ -261,7 +261,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
|
||||
read_num = read(m_pipe_out[PIPE_READ], m_pipe_buffer.get(), PipeBuffSize);
|
||||
};
|
||||
} while (::waitpid(m_child, &exit_ret, WNOHANG) == 0 && !check_timeout());
|
||||
}
|
||||
}
|
||||
else {
|
||||
// failed to create child process
|
||||
return std::nullopt;
|
||||
@@ -851,4 +851,4 @@ std::vector<uchar> asst::Controller::get_image_encode() const
|
||||
cv::imencode(".png", img, buf);
|
||||
|
||||
return buf;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user