Fix crash on keymap.js files which fail to parse #159

pixeltris · Jul 22, 2021 · 899885b · 899885b
1 parent a3e04b5
commit 899885b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/GK6X/KeyboardState.cs b/GK6X/KeyboardState.cs
@@ -243,6 +243,11 @@ private void LoadKeys()
             if (File.Exists(keysPath))
             {
                 List<object> deviceKeys = Json.Deserialize(File.ReadAllText(keysPath)) as List<object>;
+                if (deviceKeys == null)
+                {
+                    Debug.WriteLine("[WARNING] Failed to parse json '" + keysPath + "'");
+                    return;
+                }
                 foreach (object deviceKeyObj in deviceKeys)
                 {
                     Dictionary<string, object> deviceKey = deviceKeyObj as Dictionary<string, object>;