fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix.修复获取不到模拟器分辨率后报错的问题

Browse Source 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/345
This commit is contained in:
MistEO
2022-04-12 00:00:57 +08:00
parent 32dbd76119
commit f91d82de98
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MeoAssistant/Controller.cpp
View File

@@ -139,6 +139,11 @@ bool asst::Controller::connect_adb(const std::string & address)
m_emulator_info.adb.display_width = (std::max)(size_value1, size_value2);
m_emulator_info.adb.display_height = (std::min)(size_value1, size_value2);
Log.info("Width:", m_emulator_info.adb.display_width, "Height:", m_emulator_info.adb.display_height);
if (m_emulator_info.adb.display_width == 0 || m_emulator_info.adb.display_height == 0) {
return false;
}
constexpr double DefaultRatio =
static_cast<double>(WindowWidthDefault) / static_cast<double>(WindowHeightDefault);
double cur_ratio = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(m_emulator_info.adb.display_height);
@@ -471,7 +476,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;