From 7d4261806fb7da78ffd794adfc144d5b412f1899 Mon Sep 17 00:00:00 2001
From: "zhengxuan.zhang" <zhengxuan.zhang@hexagon.com>
Date: Mon, 22 Apr 2024 16:36:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=AF=B9=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HexcalMC/Hexcal/TcpIpServer.cs | 9 ++++++---
 HexcalMC/MainFrom.cs           | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HexcalMC/Hexcal/TcpIpServer.cs b/HexcalMC/Hexcal/TcpIpServer.cs
index 7cd9790..1119f56 100644
--- a/HexcalMC/Hexcal/TcpIpServer.cs
+++ b/HexcalMC/Hexcal/TcpIpServer.cs
@@ -102,9 +102,12 @@ namespace HexcalMC.Hexcal
 			try
 			{
 				WatchStatus = false;
-				_mWatchSocket.Close();
-				_mWatchSocket.Dispose();
-				_mWatchSocket = null;
+				if (_mWatchSocket != null)
+				{
+					_mWatchSocket.Close();
+					_mWatchSocket.Dispose();
+					_mWatchSocket = null;
+				}
 
 				_dictThread.Clear();
 				_dictSocket.Clear();
diff --git a/HexcalMC/MainFrom.cs b/HexcalMC/MainFrom.cs
index 5b2c7ee..ce2aa49 100644
--- a/HexcalMC/MainFrom.cs
+++ b/HexcalMC/MainFrom.cs
@@ -843,7 +843,7 @@ namespace HexcalMC
 		
 			if (_mAcsConnected)
 			{
-				DisableFaultEvent(); //取消注册事件
+				//DisableFaultEvent(); //取消注册事件
 				_acs.CloseComm();
 				
 			}
@@ -1078,7 +1078,7 @@ namespace HexcalMC
 			_mlblEnable[1] = lblEnable1;
 			_mlblEnable[2] = lblEnable2;
 
-			EnableFaultEvent(); //订阅错误事件
+			//EnableFaultEvent(); //订阅错误事件
 		}
 
 		public static bool IsWithinLimit(Point3D point) //判断点是否在行程范围内