From 1bd6839b218fbf1a72d986a6fca3964d17664be9 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Tue, 6 Sep 2016 09:24:39 -0600 Subject: [PATCH] Resolved bug with loading folders from SQL --- .../Connections/SqlConnectionsLoader.cs | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs index 9c26a20b..f248cbec 100644 --- a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs @@ -179,6 +179,9 @@ namespace mRemoteNG.Config.Connections if (_sqlDataReader.HasRows == false) return; + //var deserializer = new DataTableDeserializer(_sqlDataReader); + //var connectionTreeModel = deserializer.Deserialize(); + while (_sqlDataReader.Read()) { var tNode = new TreeNode(Convert.ToString(_sqlDataReader["Name"])); @@ -271,34 +274,32 @@ namespace mRemoteNG.Config.Connections private void AddContainerToList(TreeNode tNode) { - var contI = new ContainerInfo - { - TreeNode = tNode, - Name = Convert.ToString(_sqlDataReader["Name"]) - }; + var containerInfo = new ContainerInfo(); - var conI = GetConnectionInfoFromSql(); - conI.Parent = contI; - conI.IsContainer = true; - contI.CopyFrom(conI); + var connectionInfo = GetConnectionInfoFromSql(); + containerInfo.CopyFrom(connectionInfo); + //connectionInfo.Parent = contI; + containerInfo.IsContainer = true; + containerInfo.Name = Convert.ToString(_sqlDataReader["Name"]); + containerInfo.TreeNode = tNode; if (DatabaseUpdate) { - var prevCont = PreviousContainerList.FindByConstantID(conI.ConstantID); + var prevCont = PreviousContainerList.FindByConstantID(connectionInfo.ConstantID); if (prevCont != null) - contI.IsExpanded = prevCont.IsExpanded; + containerInfo.IsExpanded = prevCont.IsExpanded; - if (conI.ConstantID == PreviousSelected) + if (connectionInfo.ConstantID == PreviousSelected) _selectedTreeNode = tNode; } else { - contI.IsExpanded = Convert.ToBoolean(_sqlDataReader["Expanded"]); + containerInfo.IsExpanded = Convert.ToBoolean(_sqlDataReader["Expanded"]); } - ContainerList.Add(contI); - ConnectionList.Add(conI); - tNode.Tag = contI; + ContainerList.Add(containerInfo); + ConnectionList.Add(connectionInfo); + tNode.Tag = containerInfo; tNode.ImageIndex = (int)TreeImageType.Container; tNode.SelectedImageIndex = (int)TreeImageType.Container; }