From 6d21c85d98928a99debeab5b80c9c6042c0f2b73 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Wed, 6 Mar 2013 22:58:53 -0600 Subject: [PATCH] Fix issue MR-355 - Moving sub folders to top level causes property loss --- CHANGELOG.TXT | 1 + mRemoteV1/UI/UI.Window.Tree.vb | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 4469f5da..8169e472 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -2,6 +2,7 @@ Fixed issue MR-340 - Object reference not set to an instance of an object. Fixed issue MR-344 - Move "Always show panel tabs" option Fixed issue MR-350 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long. + Fixed issue MR-355 - Moving sub folders to top level causes property loss Fixed tabs not closing on double-click when the active tab is a PuTTY connection. 1.70 (2013-02-25): diff --git a/mRemoteV1/UI/UI.Window.Tree.vb b/mRemoteV1/UI/UI.Window.Tree.vb index 9eaaa454..6a321aab 100644 --- a/mRemoteV1/UI/UI.Window.Tree.vb +++ b/mRemoteV1/UI/UI.Window.Tree.vb @@ -766,7 +766,6 @@ Namespace UI Exit Sub End If - If dropNode Is targetNode.Parent Then Exit Sub End If @@ -790,9 +789,9 @@ Namespace UI ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode.Parent) = mRemoteNG.Tree.Node.Type.Root Then dropNode.Tag.Parent = Nothing If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Connection Then - dropNode.Tag.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag, False) + dropNode.Tag.Inherit.TurnOffInheritanceCompletely() ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Container Then - dropNode.Tag.ConnectionInfo.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag.ConnectionInfo, False) + dropNode.Tag.ConnectionInfo.Inherit.TurnOffInheritanceCompletely() End If End If End If