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.修复ADB子进程不释放的问题: https://github.com/MistEO/MeoAssistantArknights/issues/53

Browse Source
This commit is contained in:
MistEO
2021-12-20 22:28:53 +08:00
parent 5168222faa
commit 7f67372c8d
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAssistant/Controller.cpp
View File

@@ -98,6 +98,7 @@ bool asst::Controller::connect_adb(const std::string& address)
m_emulator_info.adb.click = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.click, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.swipe = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.swipe, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.screencap = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.screencap, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.release = utils::string_replace_all(m_emulator_info.adb.release, "[Adb]", m_adb_path);
return true;
}
@@ -115,6 +116,10 @@ asst::Controller::~Controller()
m_cmd_thread.join();
}
if (!m_emulator_info.adb.release.empty()) {
call_command(m_emulator_info.adb.release);
}
::CloseHandle(m_pipe_read);
::CloseHandle(m_pipe_write);
::CloseHandle(m_pipe_child_read);
@@ -220,10 +225,14 @@ bool asst::Controller::try_capture(const EmulatorInfo& info, bool without_handle
{
LogTraceScope("try_capture | " + info.name);
if (!m_emulator_info.adb.release.empty()) {
call_command(m_emulator_info.adb.release);
}
const HandleInfo& handle_info = info.handle;
if (!without_handle) { // 使用模拟器自带的adb
// 转成宽字符的
// 转成宽字符的
wchar_t* class_wbuff = nullptr;
if (!handle_info.class_name.empty()) {
size_t class_len = (handle_info.class_name.size() + 1) * 2;