From 30c8fce3082e195cee4ed400fff69b501522f2c4 Mon Sep 17 00:00:00 2001
From: Rain Yang <76612093+RainYangty@users.noreply.github.com>
Date: Fri, 3 Oct 2025 14:14:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=BC=BA=20playtools=20?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=BF=9E=E6=8E=A5=E6=97=B6=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=A5=97?=
 =?UTF-8?q?=E6=8E=A5=E5=AD=97=E5=AE=89=E5=85=A8=E5=85=B3=E9=97=AD=20(#1428?=
 =?UTF-8?q?0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 增强playtools关闭连接时的异常处理，确保套接字安全关闭

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 src/MaaCore/Controller/PlayToolsController.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/MaaCore/Controller/PlayToolsController.cpp b/src/MaaCore/Controller/PlayToolsController.cpp
index 904ed635e9..e19b50fb51 100644
--- a/src/MaaCore/Controller/PlayToolsController.cpp
+++ b/src/MaaCore/Controller/PlayToolsController.cpp
@@ -229,8 +229,19 @@ void asst::PlayToolsController::close()
     m_screen_size = { 0, 0 };
 
     if (m_socket.is_open()) {
-        m_socket.shutdown(tcp::socket::shutdown_both);
-        m_socket.close();
+        try {
+            m_socket.shutdown(tcp::socket::shutdown_both);
+        }
+        catch (const std::exception& e) {
+            Log.warn("Error during socket shutdown in close():", e.what());
+        }
+
+        try {
+            m_socket.close();
+        }
+        catch (const std::exception& e) {
+            Log.warn("Error during socket close() cleanup:", e.what());
+        }
     }
 }