Bix bug when selecting culture and cancelling dialog

arthurits · Apr 22, 2023 · 12c797b · 12c797b
1 parent 1351add
commit 12c797b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/ErgoLux/FrmLanguage.cs b/ErgoLux/FrmLanguage.cs
@@ -31,6 +31,11 @@ private void Accept_Click(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
+        if (Settings is not null)
+            StringResources.Culture = Settings.AppCulture;
+        else
+            StringResources.Culture = CultureInfo.InvariantCulture;
+
         DialogResult = DialogResult.Cancel;
     }
 

diff --git a/ErgoLux/FrmSettings.cs b/ErgoLux/FrmSettings.cs
@@ -1,5 +1,6 @@
 using FTD2XX_NET;
 using System.Globalization;
+using System.Text.RegularExpressions;
 
 namespace ErgoLux;
 
@@ -318,6 +319,11 @@ private void Reset_Click(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
+        if (Settings is not null)
+            StringResources.Culture = Settings.AppCulture;
+        else
+            StringResources.Culture = CultureInfo.InvariantCulture;
+
         DialogResult = DialogResult.Cancel;
     }