michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telnet terminal window closing issue fixed, ver.2.12.435

Browse Source
This commit is contained in:
Milan Hanajik
2017-01-16 13:49:30 +01:00
parent c73cf7002f
commit 13d00ee18e
5 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
-6
View File
@@ -106,12 +106,6 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
public void StopDevice()
{
if (terminalDlg != null)
{
terminalDlg.CloseDlg();
terminalDlg = null;
}
if (Telnet != null)
{
Telnet.Dispose();
TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs
-16
View File
@@ -35,21 +35,5 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
{
vtTextBox.Text = args.VtText;
}
delegate void CloseDlgDlgt(); /// Delegate of void Fn(void) function
public void CloseDlg()
{
if (dlgLoaded)
{
Invoke(new CloseDlgDlgt(OnCloseDlg));
}
}
void OnCloseDlg()
{
Close();
}
}
}
TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
+1
View File
@@ -150,6 +150,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
}
catch
{
log.FatalFormat("Roi : UdpListener() thread failed");
}
}
TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs
+1 -1
View File
@@ -271,7 +271,7 @@ namespace TBF.BenchControl.Network.Telnet
Terminate();
if (!thread.Join(2000)) throw(new Exception("Fatal error"));
if (!thread.Join(5000)) throw(new Exception("Fatal error"));
}
/// <summary>
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.12.434.1")]
[assembly: AssemblyFileVersion("2.12.434.1")]
[assembly: AssemblyVersion("2.12.435.1")]
[assembly: AssemblyFileVersion("2.12.435.1")]