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

fix: call_command 外部中断时中止进程

Browse Source
This commit is contained in:
zzyyyl
2023-10-24 16:20:11 +08:00
parent 575d0412ce
commit d6b377dca4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MaaCore/Controller/Platform/Win32IO.cpp
View File

@@ -208,12 +208,6 @@ std::optional<int> asst::Win32IO::call_command(const std::string& cmd, bool recv
}
}
DWORD exit_ret = 0;
GetExitCodeProcess(process_info.hProcess, &exit_ret);
CloseHandle(process_info.hProcess);
CloseHandle(process_info.hThread);
CloseHandle(pipe_parent_read);
CloseHandle(pipeov.hEvent);
if (recv_by_socket) {
if (accept_pending) {
Log.warn("cancel AcceptEx");
@@ -228,6 +222,16 @@ std::optional<int> asst::Win32IO::call_command(const std::string& cmd, bool recv
CloseHandle(sockov.hEvent);
}
if (process_running) {
TerminateProcess(process_info.hProcess, 0);
}
DWORD exit_ret = 0;
GetExitCodeProcess(process_info.hProcess, &exit_ret);
CloseHandle(process_info.hProcess);
CloseHandle(process_info.hThread);
CloseHandle(pipe_parent_read);
CloseHandle(pipeov.hEvent);
return static_cast<int>(exit_ret);
}