From 992a3f9d1cfe5b2c7d4597cd75043728ea470735 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Wed, 17 Oct 2018 16:52:22 -0500 Subject: [PATCH 1/4] cherrypicked pr #1145 Fixing "Reconnect to previously opened sessions on startup" --- mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs b/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs index 4ff069e0..038b7fff 100644 --- a/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs +++ b/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs @@ -2,6 +2,7 @@ using System.Collections.Specialized; using System.ComponentModel; using mRemoteNG.Connection; +using mRemoteNG.UI.Forms; namespace mRemoteNG.Config.Connections { @@ -44,6 +45,8 @@ namespace mRemoteNG.Config.Connections { if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit) return; + if (FrmMain.Default.IsClosing) + return; _connectionsService.SaveConnectionsAsync(); } From b00dd1c5f5066b3a588c81174ebb5b07ba104af5 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Wed, 17 Oct 2018 17:48:16 -0500 Subject: [PATCH 2/4] fixes #1136 --- mRemoteV1/Connection/Protocol/PuttyBase.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mRemoteV1/Connection/Protocol/PuttyBase.cs b/mRemoteV1/Connection/Protocol/PuttyBase.cs index cc18f610..00469872 100644 --- a/mRemoteV1/Connection/Protocol/PuttyBase.cs +++ b/mRemoteV1/Connection/Protocol/PuttyBase.cs @@ -199,7 +199,14 @@ namespace mRemoteNG.Connection.Protocol { return; } - NativeMethods.MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + SystemInformation.FrameBorderSize.Width * 2, InterfaceControl.Height + SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height * 2, true); + + var left = -(SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness); + var top = -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height + SystemInformation.VerticalResizeBorderThickness); + var width = InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness) * 2; + var height = InterfaceControl.Height + SystemInformation.CaptionHeight + + (SystemInformation.FrameBorderSize.Height + SystemInformation.VerticalResizeBorderThickness) * 2; + + NativeMethods.MoveWindow(PuttyHandle, left, top, width, height, true); } catch (Exception ex) { From 3234896caf2801ffaf15c98d1eddc0d34af3d63b Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 18 Oct 2018 17:08:22 -0500 Subject: [PATCH 3/4] bumped version --- mRemoteV1/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Properties/AssemblyInfo.cs b/mRemoteV1/Properties/AssemblyInfo.cs index 47891a64..6f84fe84 100644 --- a/mRemoteV1/Properties/AssemblyInfo.cs +++ b/mRemoteV1/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // -[assembly: AssemblyVersion("1.76.10.*")] +[assembly: AssemblyVersion("1.76.11.*")] [assembly: NeutralResourcesLanguage("en")] \ No newline at end of file From 21e51c8455c0e2898dd1a49f8dcedf2c0da45cbc Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 18 Oct 2018 17:08:30 -0500 Subject: [PATCH 4/4] updated changelog and credits --- CHANGELOG.TXT | 8 ++++++++ CREDITS.TXT | 1 + 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 9e9cf0cc..134e8f94 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,11 @@ +1.76.11 (2018-10-18): + +Fixes: +------ +#1139: Feature "Reconnect to previously opened sessions" not working +#1136: Putty window not maximized + + 1.76.10 (2018-10-07): Fixes: diff --git a/CREDITS.TXT b/CREDITS.TXT index 2fe404fa..1375430d 100644 --- a/CREDITS.TXT +++ b/CREDITS.TXT @@ -24,6 +24,7 @@ github.com/pfjason github.com/sirLoaf github.com/Fyers Vladimir Semenov (github.com/sli-pro) +Stephan (github.com/st-schuler) Past Contributors