From 33857f71aec3895e42e57f11deaa7f8e7fbf245b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 07 四月 2023 09:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/DAL/DriverLayer/Control_TcpClient.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
index c90eac3..251f039 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
@@ -295,7 +295,10 @@
}
finally
{
- heartBeatThread = null;
+ if (heartBeatThread != null)
+ {
+ heartBeatThread = null;
+ }
HeartBeat();
}
}
--
Gitblit v1.8.0