fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix. fix some compile errors, etc

Browse Source
This commit is contained in:
Horror Proton
2022-09-15 01:21:04 +08:00
parent 61b57ae189
commit 40e5886ceb
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MeoAssistant/Controller.cpp
View File

@@ -15,7 +15,6 @@
#include <chrono>
#include <cstdint>
#include <memory>
#include <regex>
#include <utility>
#include <vector>
@@ -399,14 +398,13 @@ std::optional<std::string> asst::Controller::call_command(const std::string& cmd
}
else if (m_child > 0) {
// parent process
std::unique_lock<std::mutex> pipe_lock(m_pipe_mutex);
do {
ssize_t read_num = read(m_pipe_out[PIPE_READ], pipe_buffer.get(), PipeBuffSize);
ssize_t read_num = read(m_pipe_out[PIPE_READ], pipe_buffer.get(), pipe_buffer.size());
while (read_num > 0) {
pipe_data.insert(pipe_data.end(), pipe_buffer.get(), pipe_buffer.get() + read_num);
read_num = read(m_pipe_out[PIPE_READ], pipe_buffer.get(), PipeBuffSize);
};
read_num = read(m_pipe_out[PIPE_READ], pipe_buffer.get(), pipe_buffer.size());
}
} while (::waitpid(m_child, &exit_ret, WNOHANG) == 0 && !check_timeout());
}
else {