Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

close the protocol properly, just not the DockContent...

Browse Source
This commit is contained in:
Sean Kaim
2019-01-08 12:16:50 -05:00
parent 8a94000d98
commit a107d0586f
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mRemoteV1/UI/Tabs/ConnectionTab.cs
View File

@@ -41,6 +41,11 @@ namespace mRemoteNG.UI.Tabs
((InterfaceControl)Tag).Protocol.Close();
}
}
else
{
// close without the confirmation prompt...
((InterfaceControl)Tag).Protocol.Close();
}
}
else
{

16
mRemoteV1/UI/Tabs/DockPaneStripNG.cs
View File

@@ -4,6 +4,7 @@ using System.Drawing;
using System.Drawing.Drawing2D;
using System.Security.Permissions;
using System.Windows.Forms;
using mRemoteNG.Connection;
using WeifenLuo.WinFormsUI.Docking;
namespace mRemoteNG.UI.Tabs
@@ -1250,7 +1251,8 @@ namespace mRemoteNG.UI.Tabs
private void Close_Click(object sender, EventArgs e)
{
DockPane.CloseActiveContent();
CloseProtocol();
if (PatchController.EnableMemoryLeakFix == true)
{
ContentClosed();
@@ -1332,8 +1334,14 @@ namespace mRemoteNG.UI.Tabs
base.OnRightToLeftChanged(e);
PerformLayout();
}
#region Native Methods
private void CloseProtocol()
{
var ic = InterfaceControl.FindInterfaceControl(DockPane.DockPanel);
ic?.Protocol.Close();
}
#region Native Methods
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
protected override void WndProc(ref Message m)
{
@@ -1343,7 +1351,9 @@ namespace mRemoteNG.UI.Tabs
if (!Settings.Default.DoubleClickOnTabClosesIt) return;
// Option is set, close the tab, then send to base.
DockPane.CloseActiveContent();
//DockPane.CloseActiveContent();
CloseProtocol();
if (PatchController.EnableMemoryLeakFix == true)
{
ContentClosed();