Merge pull request #50 from watte1997/FixSlaveDisConnect

graham22 · web-flow · commit c980019a7d4d · 2024-09-27T08:51:11.000-04:00
Fixed disconnect button cannot stop connection.
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

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,13 @@ private void DoDisconnect()`
`154`	`154`	`_uart.Dispose();`
`155`	`155`	`_uart = null;`
`156`	`156`	`}`
	`157`	`+`
	`158`	`+ if (_socket != null)`
	`159`	`+ {`
	`160`	`+ _socket.Dispose();`
	`161`	`+ _socket = null;`
	`162`	`+ }`
	`163`	`+`
`157`	`164`	`if (_thread != null && _thread.IsAlive)`
`158`	`165`	`{`
`159`	`166`	`if (_thread.Join(2000) == false)`
`@@ -162,11 +169,6 @@ private void DoDisconnect()`
`162`	`169`	`_thread = null;`
`163`	`170`	`}`
`164`	`171`	`}`
`165`		`- if (_socket != null)`
`166`		`- {`
`167`		`- _socket.Dispose();`
`168`		`- _socket = null;`
`169`		`- }`
`170`	`172`	`}`
`171`	`173`
`172`	`174`	`#endregion`