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:
Faryan Rezagholi
2019-10-03 18:52:48 +02:00
parent 1e374d3a25
commit 5c07327467
2 changed files with 7 additions and 7 deletions

View File

@@ -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);

View File

@@ -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);