mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
initialize settingsLoader earlier in code to prevent ui elements from being created before the language culture is propeperly set, part of #1497
This commit is contained in:
2
mRemoteV1/UI/Forms/frmMain.Designer.cs
generated
2
mRemoteV1/UI/Forms/frmMain.Designer.cs
generated
@@ -205,7 +205,7 @@
|
||||
this.Opacity = 0D;
|
||||
this.Text = " ";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
|
||||
this.Load += new System.EventHandler(this.frmMain_Load);
|
||||
this.Load += new System.EventHandler(this.FrmMain_Load);
|
||||
this.Shown += new System.EventHandler(this.frmMain_Shown);
|
||||
this.ResizeBegin += new System.EventHandler(this.frmMain_ResizeBegin);
|
||||
this.ResizeEnd += new System.EventHandler(this.frmMain_ResizeEnd);
|
||||
|
||||
@@ -139,19 +139,19 @@ namespace mRemoteNG.UI.Forms
|
||||
|
||||
#region Startup & Shutdown
|
||||
|
||||
private void frmMain_Load(object sender, EventArgs e)
|
||||
private void FrmMain_Load(object sender, EventArgs e)
|
||||
{
|
||||
var messageCollector = Runtime.MessageCollector;
|
||||
|
||||
var settingsLoader = new SettingsLoader(this, messageCollector, _quickConnectToolStrip,
|
||||
_externalToolsToolStrip, _multiSshToolStrip, msMain);
|
||||
settingsLoader.LoadSettings();
|
||||
|
||||
MessageCollectorSetup.SetupMessageCollector(messageCollector, _messageWriters);
|
||||
MessageCollectorSetup.BuildMessageWritersFromSettings(_messageWriters);
|
||||
|
||||
Startup.Instance.InitializeProgram(messageCollector);
|
||||
|
||||
msMain.Location = Point.Empty;
|
||||
var settingsLoader = new SettingsLoader(this, messageCollector, _quickConnectToolStrip,
|
||||
_externalToolsToolStrip, _multiSshToolStrip, msMain);
|
||||
settingsLoader.LoadSettings();
|
||||
|
||||
SetMenuDependencies();
|
||||
|
||||
var uiLoader = new DockPanelLayoutLoader(this, messageCollector);
|
||||
|
||||
Reference in New Issue
Block a user