Merge pull request #804 from dremin/handle-kbd-layout-error

Handle error getting keyboard layout
dremin · Apr 21, 2024 · 145b988 · 145b988
2 parents dbc09f2 + 4faf298
commit 145b988
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/RetroBar/Controls/InputLanguage.xaml.cs b/RetroBar/Controls/InputLanguage.xaml.cs
@@ -4,6 +4,7 @@
 using System.Windows.Controls;
 using System.Windows.Threading;
 using ManagedShell.Common.Helpers;
+using ManagedShell.Common.Logging;
 using RetroBar.Utilities;
 
 namespace RetroBar.Controls
@@ -47,8 +48,15 @@ private void Initialize()
 
         private void SetLocaleIdentifier()
         {
-            var managedShellLayout = KeyboardLayoutHelper.GetKeyboardLayout(false);
-            LocaleIdentifier = CultureInfo.GetCultureInfo((short)managedShellLayout.HKL);
+            try
+            {
+                var managedShellLayout = KeyboardLayoutHelper.GetKeyboardLayout(false);
+                LocaleIdentifier = CultureInfo.GetCultureInfo((short)managedShellLayout.HKL);
+            }
+            catch (Exception ex)
+            {
+                ShellLogger.Error($"Error getting locale identifier: {ex.Message}");
+            }
         }
 
         private void StartWatch()

diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -1,8 +1,6 @@
 using ManagedShell.AppBar;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace RetroBar.Utilities