[MWB]Fix crash when trying to read null settings (#27682)

microsoft · Jul 31, 2023 · a1f21fd · a1f21fd
1 parent 3a03ff0
commit a1f21fd
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/settings-ui/Settings.UI.Library/MouseWithoutBordersSettings.cs b/src/settings-ui/Settings.UI.Library/MouseWithoutBordersSettings.cs
@@ -56,13 +56,25 @@ public bool UpgradeSettingsConfiguration()
             {
                 Version = "1.1";
 
-                Properties.ToggleEasyMouseShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyToggleEasyMouse.Value);
-
-                Properties.LockMachineShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyLockMachine.Value);
-
-                Properties.ReconnectShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyReconnect.Value);
-
-                Properties.Switch2AllPCShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeySwitch2AllPC.Value);
+                if (Properties.HotKeyToggleEasyMouse != null)
+                {
+                    Properties.ToggleEasyMouseShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyToggleEasyMouse.Value);
+                }
+
+                if (Properties.HotKeyLockMachine != null)
+                {
+                    Properties.LockMachineShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyLockMachine.Value);
+                }
+
+                if (Properties.HotKeyReconnect != null)
+                {
+                    Properties.ReconnectShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeyReconnect.Value);
+                }
+
+                if (Properties.HotKeySwitch2AllPC != null)
+                {
+                    Properties.Switch2AllPCShortcut = ConvertMouseWithoutBordersHotKeyToPowerToys(Properties.HotKeySwitch2AllPC.Value);
+                }
 
                 Properties.HotKeyToggleEasyMouse = null;
                 Properties.HotKeyLockMachine = null;