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. 修复部分模拟器socket截图超时的问题

Browse Source 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/826
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/820
This commit is contained in:
MistEO
2022-06-11 03:27:01 +08:00
parent 3083129cd0
commit 5ef77d4b20
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MeoAssistant/Controller.cpp
View File

@@ -285,6 +285,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
select(static_cast<int>(m_server_sock) + 1, &fdset, NULL, NULL, &select_timeout);
if (FD_ISSET(m_server_sock, &fdset)) {
SOCKET client_sock = ::accept(m_server_sock, NULL, NULL);
setsockopt(client_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&select_timeout, sizeof(int));
int recv_size = 0;
do {
recv_size = ::recv(client_sock, (char*)m_socket_buffer.get(), SocketBuffSize, NULL);
@@ -340,7 +341,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
else {
// failed to create child process
return std::nullopt;
}
}
#endif
Log.trace("Call `", cmd, "` ret", exit_ret, ", output size:", pipe_data.size());