diff --git a/DS4Windows/DS4Forms/LanguagePackComboBox.Designer.cs b/DS4Windows/DS4Forms/LanguagePackComboBox.Designer.cs index 84e31df..1ed1ff2 100644 --- a/DS4Windows/DS4Forms/LanguagePackComboBox.Designer.cs +++ b/DS4Windows/DS4Forms/LanguagePackComboBox.Designer.cs @@ -55,7 +55,6 @@ this.Controls.Add(this.cbCulture); this.Controls.Add(this.label1); this.Name = "LanguagePackComboBox"; - this.Load += new System.EventHandler(this.LanguagePackComboBox_Load); this.SizeChanged += new System.EventHandler(this.LanguagePackComboBox_SizeChanged); this.Resize += new System.EventHandler(this.LanguagePackComboBox_SizeChanged); this.ResumeLayout(false); diff --git a/DS4Windows/DS4Forms/LanguagePackComboBox.cs b/DS4Windows/DS4Forms/LanguagePackComboBox.cs index ae0ced5..b626f60 100644 --- a/DS4Windows/DS4Forms/LanguagePackComboBox.cs +++ b/DS4Windows/DS4Forms/LanguagePackComboBox.cs @@ -78,6 +78,19 @@ namespace DS4Windows.DS4Forms { InitializeComponent(); cbCulture.Enabled = false; + + Task.Run(() => { + // Find available language assemblies and bind the list to the combo box. + cbCulture.DataSource = CreateLanguageAssembliesBindingSource(); + cbCulture.SelectedValue = Thread.CurrentThread.CurrentUICulture.Name; + + // This must be set here instead of Designer or event would fire at initial selected value setting above. + cbCulture.SelectedIndexChanged += new EventHandler(CbCulture_SelectedIndexChanged); + cbCulture.SelectedValueChanged += new EventHandler(CbCulture_SelectedValueChanged); + + cbCulture.Enabled = true; + LanguageListInitialized.SetResult(true); + }); } private BindingSource CreateLanguageAssembliesBindingSource() @@ -130,21 +143,5 @@ namespace DS4Windows.DS4Forms { SelectedValueChanged?.Invoke(this, e); } - - private void LanguagePackComboBox_Load(object sender, EventArgs e) - { - Invoke(new Action(() => { - // Find available language assemblies and bind the list to the combo box. - cbCulture.DataSource = CreateLanguageAssembliesBindingSource(); - cbCulture.SelectedValue = Thread.CurrentThread.CurrentUICulture.Name; - - // This must be set here instead of Designer or event would fire at initial selected value setting above. - cbCulture.SelectedIndexChanged += new EventHandler(CbCulture_SelectedIndexChanged); - cbCulture.SelectedValueChanged += new EventHandler(CbCulture_SelectedValueChanged); - - cbCulture.Enabled = true; - LanguageListInitialized.SetResult(true); - })); - } } }