From c9e7f829054b8354b64afd8f76597584d2a55ab1 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 20 Apr 2017 08:53:57 -0600 Subject: [PATCH 1/3] fixed minor bug with adding a duplicate default session in some situations --- mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs b/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs index 402a32016..1aa2c931b 100644 --- a/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs +++ b/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs @@ -31,7 +31,7 @@ namespace mRemoteNG.Config.Putty if (raw && !sessionNames.Contains("Default%20Settings")) sessionNames.Insert(0, "Default%20Settings"); - else if (!sessionNames.Contains("Default Settings")) + else if (!raw && !sessionNames.Contains("Default Settings")) sessionNames.Insert(0, "Default Settings"); return sessionNames.ToArray(); From 1520b8bf73eb3c570a313d9a1f94f8c4f3817b55 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 20 Apr 2017 09:07:21 -0600 Subject: [PATCH 2/3] fixed bug where any sessions with spaces in the name would be filtered out this fixes the bug, but the entire putty sessions loading component should be refactored heavily --- mRemoteV1/Config/Putty/AbstractPuttySessionsProvider.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Putty/AbstractPuttySessionsProvider.cs b/mRemoteV1/Config/Putty/AbstractPuttySessionsProvider.cs index cbd5d443c..dad5a27ca 100644 --- a/mRemoteV1/Config/Putty/AbstractPuttySessionsProvider.cs +++ b/mRemoteV1/Config/Putty/AbstractPuttySessionsProvider.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using System.Web; using mRemoteNG.Connection; using mRemoteNG.Tree.Root; @@ -42,7 +43,8 @@ namespace mRemoteNG.Config.Putty private IEnumerable GetSessionToRemove(IEnumerable sessionNamesFromProvider) { var currentlyKnownSessionNames = Sessions.Select(session => session.Name); - var sessionNamesToRemove = currentlyKnownSessionNames.Except(sessionNamesFromProvider); + var normalizedSessionNames = sessionNamesFromProvider.Select(HttpUtility.UrlDecode); + var sessionNamesToRemove = currentlyKnownSessionNames.Except(normalizedSessionNames); return Sessions.Where(session => sessionNamesToRemove.Contains(session.Name)); } From e3e4c49427f41daf830088c9f7bb79d4b9f45f8f Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 20 Apr 2017 09:16:31 -0600 Subject: [PATCH 3/3] changelog update --- CHANGELOG.TXT | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index a6f81bc50..ac7a747a7 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -4,6 +4,7 @@ Fixes: ------ #410: Update PuTTYNG to 0.68 #434: Fix complier warnings CA1049 & CA2111 +#442: Fixed issue loading PuTTY sessions that have spaces in the name #502: Problems with ParentID for Duplicated Containers/Connections with SQL Connection Storage #514: Expanded property not saved/loaded properly from SQL #518: Exception when Importing File