From 5c073274671872701bf6475ea16bd2e3c0b4e4e7 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Thu, 3 Oct 2019 18:52:48 +0200 Subject: [PATCH] initialize settingsLoader earlier in code to prevent ui elements from being created before the language culture is propeperly set, part of #1497 --- mRemoteV1/UI/Forms/frmMain.Designer.cs | 2 +- mRemoteV1/UI/Forms/frmMain.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mRemoteV1/UI/Forms/frmMain.Designer.cs b/mRemoteV1/UI/Forms/frmMain.Designer.cs index dc8c75a75..f146b4b23 100644 --- a/mRemoteV1/UI/Forms/frmMain.Designer.cs +++ b/mRemoteV1/UI/Forms/frmMain.Designer.cs @@ -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); diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs index 2b144ce60..be81bb350 100644 --- a/mRemoteV1/UI/Forms/frmMain.cs +++ b/mRemoteV1/UI/Forms/frmMain.cs @@ -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);