Merge pull request #50 from watte1997/FixSlaveDisConnect

Fixed disconnect button cannot stop connection.
ClassicDIY · Sep 27, 2024 · c980019 · c980019
2 parents 727518e + 4b3f368
commit c980019
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/ModbusSlave/ModbusSlave.csproj b/ModbusSlave/ModbusSlave.csproj
@@ -180,4 +180,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ModbusSlave/SlaveForm.cs b/ModbusSlave/SlaveForm.cs
@@ -154,6 +154,13 @@ private void DoDisconnect()
                 _uart.Dispose();
                 _uart = null;
             }
+
+            if (_socket != null)
+            {
+                _socket.Dispose();
+                _socket = null;
+            }
+
             if (_thread != null && _thread.IsAlive)
             {
                 if (_thread.Join(2000) == false)
@@ -162,11 +169,6 @@ private void DoDisconnect()
                     _thread = null;
                 }
             }
-            if (_socket != null)
-            {
-                _socket.Dispose();
-                _socket = null;
-            }
         }
 
         #endregion