[Settings] Do not try to apply profile settings if there was a timeout (

#16933)
microsoft · Mar 10, 2022 · a8fb9e0 · a8fb9e0
1 parent 309a066
commit a8fb9e0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/settings-ui/Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs b/src/settings-ui/Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
@@ -273,16 +273,23 @@ public bool LoadProfile()
                     }
                 });
 
-                t.Wait(1000, ts.Token);
+                var completedInTime = t.Wait(3000, ts.Token);
                 ts.Cancel();
                 ts.Dispose();
 
-                if (!readSuccessfully)
+                if (readSuccessfully)
+                {
+                    FilterRemapKeysList(_profile?.RemapKeys?.InProcessRemapKeys);
+                }
+                else
                 {
                     success = false;
                 }
 
-                FilterRemapKeysList(_profile?.RemapKeys?.InProcessRemapKeys);
+                if (!completedInTime)
+                {
+                    Logger.LogError($"Timeout encountered when loading {PowerToyName} profile");
+                }
             }
             catch (Exception e)
             {
@@ -291,6 +298,11 @@ public bool LoadProfile()
                 success = false;
             }
 
+            if (!success)
+            {
+                Logger.LogError($"Couldn't load {PowerToyName} profile");
+            }
+
             return success;
         }
     }

diff --git a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml.cs b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml.cs
@@ -80,10 +80,13 @@ private static void CombineRemappings(List<KeysDataModel> remapKeysList, uint le
 
         private int FilterRemapKeysList(List<KeysDataModel> remapKeysList)
         {
-            CombineRemappings(remapKeysList, (uint)VirtualKey.LeftControl, (uint)VirtualKey.RightControl, (uint)VirtualKey.Control);
-            CombineRemappings(remapKeysList, (uint)VirtualKey.LeftMenu, (uint)VirtualKey.RightMenu, (uint)VirtualKey.Menu);
-            CombineRemappings(remapKeysList, (uint)VirtualKey.LeftShift, (uint)VirtualKey.RightShift, (uint)VirtualKey.Shift);
-            CombineRemappings(remapKeysList, (uint)VirtualKey.LeftWindows, (uint)VirtualKey.RightWindows, Helper.VirtualKeyWindows);
+            if (remapKeysList != null)
+            {
+                CombineRemappings(remapKeysList, (uint)VirtualKey.LeftControl, (uint)VirtualKey.RightControl, (uint)VirtualKey.Control);
+                CombineRemappings(remapKeysList, (uint)VirtualKey.LeftMenu, (uint)VirtualKey.RightMenu, (uint)VirtualKey.Menu);
+                CombineRemappings(remapKeysList, (uint)VirtualKey.LeftShift, (uint)VirtualKey.RightShift, (uint)VirtualKey.Shift);
+                CombineRemappings(remapKeysList, (uint)VirtualKey.LeftWindows, (uint)VirtualKey.RightWindows, Helper.VirtualKeyWindows);
+            }
 
             return 0;
         }