Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-26 03:58:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix self-reference initialization error

Browse Source
This commit is contained in:
David Sparer
2016-08-09 15:49:52 -06:00
parent f41adec096
commit 9ffdbee400
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mRemoteV1/App/Startup.cs
View File

@@ -48,6 +48,7 @@ namespace mRemoteNG.App
ParseCommandLineArgs();
IeBrowserEmulation.Register();
GetConnectionIcons();
DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, (a)=>"InhDefault"+a);
}

3
mRemoteV1/Config/Import/ActiveDirectory.cs
View File

@@ -87,7 +87,8 @@ namespace mRemoteNG.Config.Import
var treeNode = ConnectionTreeNode.AddNode(TreeNodeType.Connection, displayName);
var connectionInfo = new ConnectionInfo();
var inheritanceInfo = new ConnectionInfoInheritance(connectionInfo, true);
var inheritanceInfo = new ConnectionInfoInheritance(connectionInfo);
inheritanceInfo.TurnOnInheritanceCompletely();
inheritanceInfo.Description = false;
if (parentTreeNode.Tag is ContainerInfo)
{

7
mRemoteV1/Connection/ConnectionInfoInheritance.cs
View File

@@ -297,15 +297,14 @@ namespace mRemoteNG.Connection
#endregion
public ConnectionInfoInheritance(object parent, bool inheritEverything = false)
public ConnectionInfoInheritance(object parent, bool ignoreDefaultInheritance = false)
{
Parent = parent;
if (inheritEverything)
TurnOnInheritanceCompletely();
if (!ignoreDefaultInheritance)
SetAllValues(DefaultConnectionInheritance.Instance);
}
public ConnectionInfoInheritance Copy()
{
return (ConnectionInfoInheritance)MemberwiseClone();

2
mRemoteV1/Connection/DefaultConnectionInheritance.cs
View File

@@ -7,7 +7,7 @@ namespace mRemoteNG.Connection
{
public static DefaultConnectionInheritance Instance { get; } = new DefaultConnectionInheritance();
private DefaultConnectionInheritance() : base(null)
private DefaultConnectionInheritance() : base(null, true)
{
}

4
mRemoteV1/UI/Window/ConfigWindow.cs
View File

@@ -1620,9 +1620,7 @@ namespace mRemoteNG.UI.Window
InheritanceVisible = false;
DefaultPropertiesVisible = false;
DefaultInheritanceVisible = true;
var defaultInheritance = DefaultConnectionInheritance.Instance;
defaultInheritance.LoadFrom<Settings>(Settings.Default, (a)=>"InhDefault"+a);
SetPropertyGridObject(defaultInheritance);
SetPropertyGridObject(DefaultConnectionInheritance.Instance);
}
}