Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

rearranged program init to ensure ConDefaultPassword is decrypted before assignment to DefaultConnectionInfo object

Browse Source
This commit is contained in:
David Sparer
2017-09-17 11:10:32 -05:00
parent 024f1a7047
commit 3cb52ba3f1
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mRemoteV1/App/Startup.cs
View File

@@ -42,8 +42,6 @@ namespace mRemoteNG.App
ParseCommandLineArgs();
IeBrowserEmulation.Register();
GetConnectionIcons();
DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, a=>"ConDefault"+a);
DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, a=>"InhDefault"+a);
}
private static void GetConnectionIcons()

11
mRemoteV1/UI/Forms/frmMain.cs
View File

@@ -187,8 +187,9 @@ namespace mRemoteNG.UI.Forms
// Create gui config load and save objects
var settingsLoader = new SettingsLoader(this);
settingsLoader.LoadSettings();
ApplyLanguage();
LoadDefaultConnectionInfo();
ApplyLanguage();
PopulateQuickConnectProtocolMenu();
ThemeManager.ThemeChanged += ApplyThemes;
ApplyThemes();
@@ -221,6 +222,12 @@ namespace mRemoteNG.UI.Forms
ConnectionTreeWindow = Windows.TreeForm;
}
private void LoadDefaultConnectionInfo()
{
DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, a => "ConDefault" + a);
DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, a => "InhDefault" + a);
}
private void ApplyLanguage()
{
mMenFile.Text = Language.strMenuFile;