From d69d948963734818fe736fe42a309e4f93057b24 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Sat, 4 May 2013 23:08:38 -0500 Subject: [PATCH] Fix issue MR-446 - Putty saved sessions show in connection panel --- CHANGELOG.TXT | 1 + mRemoteV1/Config/PuttySessions.vb | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 488ca8a4a..7b7d43ae6 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -5,6 +5,7 @@ Fixed issue MR-424 - Import of a few Linux SSH2 hosts discovered via the port scan tool results in a UE Fixed issue MR-439 - MRemoteNG 1.70 does not start Fixed issue MR-440 - RDP import with non-standard port + Fixed issue MR-446 - Putty saved sessions show in connection panel Fixed issue MR-471 - PuTTY Saved Sessions disappears from connection list Added PuTTY Session Settings command to the Config panel for PuTTY Saved Sessions. Fixed an exception or crash when choosing unnamed colors for themes. diff --git a/mRemoteV1/Config/PuttySessions.vb b/mRemoteV1/Config/PuttySessions.vb index 0f22c10c5..212904b29 100644 --- a/mRemoteV1/Config/PuttySessions.vb +++ b/mRemoteV1/Config/PuttySessions.vb @@ -60,7 +60,6 @@ Namespace Config If sessionsKey Is Nothing Then Return New String() {} Dim sessionNames As New List(Of String) - If Not raw Then sessionNames.Add("Default Settings") ' Do not localize For Each sessionName As String In sessionsKey.GetSubKeyNames() If raw Then sessionNames.Add(sessionName) @@ -68,6 +67,17 @@ Namespace Config sessionNames.Add(Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B"))) End If Next + + If raw Then + If Not sessionNames.Contains("Default%20Settings") Then ' Do not localize + sessionNames.Insert(0, "Default%20Settings") + End If + Else + If Not sessionNames.Contains("Default Settings") Then + sessionNames.Insert(0, "Default Settings") + End If + End If + Return sessionNames.ToArray() End Function @@ -75,6 +85,7 @@ Namespace Config Dim sessionList As New List(Of Connection.PuttySession.Info) Dim sessionInfo As Connection.Info For Each sessionName As String In GetSessionNames(True) + If sessionName = "Default%20Settings" Then Continue For ' Do not localize sessionInfo = SessionToConnectionInfo(sessionName) If sessionInfo Is Nothing Then Continue For sessionList.Add(sessionInfo)