From a1b759881020506872b4630cd42b2380da52bfde Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 7 Nov 2022 19:47:57 +0800 Subject: [PATCH] fix: build error on mac --- src/MeoAssistant/Controller.cpp | 11 +++++------ src/MeoAssistant/Controller.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 99a00b3dce..daeeaa7bd7 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -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) diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index b9d4874c9e..1209d5fe64 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -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 init_socket(const std::string& local_address); using DecodeFunc = std::function;