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

fix: build error on mac

Browse Source
This commit is contained in:
MistEO
2022-11-07 19:47:57 +08:00
parent 902783b851
commit a1b7598810
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAssistant/Controller.cpp
View File

@@ -527,12 +527,12 @@ void asst::Controller::clear_info() noexcept
m_scale_size = { WindowWidthDefault, WindowHeightDefault };
}
void asst::Controller::close_socket(SOCKET& sock) noexcept
void asst::Controller::close_socket() noexcept
{
#ifdef _WIN32
if (sock != INVALID_SOCKET) {
::closesocket(sock);
sock = INVALID_SOCKET;
if (m_server_sock != INVALID_SOCKET) {
::closesocket(m_server_sock);
m_server_sock = INVALID_SOCKET;
}
#else
if (m_server_sock >= 0) {
@@ -1258,8 +1258,7 @@ void asst::Controller::kill_adb_daemon()
bool asst::Controller::release()
{
close_socket(m_server_sock);
m_server_started = false;
close_socket();
#ifndef _WIN32
if (m_child)

2
src/MeoAssistant/Controller.h
View File

@@ -73,7 +73,7 @@ namespace asst
void kill_adb_daemon();
bool set_inited(bool inited);
void close_socket(SOCKET& sock) noexcept;
void close_socket() noexcept;
std::optional<unsigned short> init_socket(const std::string& local_address);
using DecodeFunc = std::function<bool(std::string_view)>;