Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Nekrasov
2022-03-10 20:31:16 +03:00
committed by GitHub
parent 309a0661c3
commit a8fb9e0804
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/settings-ui/Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
View File

@@ -273,16 +273,23 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
} }
}); });
t.Wait(1000, ts.Token); var completedInTime = t.Wait(3000, ts.Token);
ts.Cancel(); ts.Cancel();
ts.Dispose(); ts.Dispose();
if (!readSuccessfully) if (readSuccessfully)
{
FilterRemapKeysList(_profile?.RemapKeys?.InProcessRemapKeys);
}
else
{ {
success = false; success = false;
} }
FilterRemapKeysList(_profile?.RemapKeys?.InProcessRemapKeys); if (!completedInTime)
{
Logger.LogError($"Timeout encountered when loading {PowerToyName} profile");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -291,6 +298,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
success = false; success = false;
} }
if (!success)
{
Logger.LogError($"Couldn't load {PowerToyName} profile");
}
return success; return success;
} }
} }

11
src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml.cs
View File

@@ -80,10 +80,13 @@ namespace Microsoft.PowerToys.Settings.UI.Views
private int FilterRemapKeysList(List<KeysDataModel> remapKeysList) private int FilterRemapKeysList(List<KeysDataModel> remapKeysList)
{ {
CombineRemappings(remapKeysList, (uint)VirtualKey.LeftControl, (uint)VirtualKey.RightControl, (uint)VirtualKey.Control); if (remapKeysList != null)
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.LeftControl, (uint)VirtualKey.RightControl, (uint)VirtualKey.Control);
CombineRemappings(remapKeysList, (uint)VirtualKey.LeftWindows, (uint)VirtualKey.RightWindows, Helper.VirtualKeyWindows); 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; return 0;
} }