Fix keyboard error with empty keygroup

kmcnaught · Mar 14, 2023 · 681e39e · 681e39e
1 parent 5381f00
commit 681e39e
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/JuliusSweetland.OptiKey.Core/UI/Views/Keyboards/Common/DynamicKeyboard.xaml.cs b/src/JuliusSweetland.OptiKey.Core/UI/Views/Keyboards/Common/DynamicKeyboard.xaml.cs
@@ -862,10 +862,13 @@ private void CreateDynamicKey(XmlDynamicKey xmlKey, KeyValue xmlKeyValue, int mi
             //add this item's KeyValue to each KeyGroup referenced in its definition
             foreach (KeyGroup vKeyGroup in xmlKey.KeyGroups)
             {
-                if (!keyValueByGroup.ContainsKey(vKeyGroup.Value.ToUpper()))
-                    keyValueByGroup.Add(vKeyGroup.Value.ToUpper(), new List<KeyValue> { xmlKeyValue });
-                else if (!keyValueByGroup[vKeyGroup.Value.ToUpper()].Contains(xmlKeyValue))
-                    keyValueByGroup[vKeyGroup.Value.ToUpper()].Add(xmlKeyValue);
+                if (vKeyGroup.Value != null)
+                {
+                    if (!keyValueByGroup.ContainsKey(vKeyGroup.Value.ToUpper()))
+                        keyValueByGroup.Add(vKeyGroup.Value.ToUpper(), new List<KeyValue> { xmlKeyValue });
+                    else if (!keyValueByGroup[vKeyGroup.Value.ToUpper()].Contains(xmlKeyValue))
+                        keyValueByGroup[vKeyGroup.Value.ToUpper()].Add(xmlKeyValue);
+                }
             }
 
             if (xmlKey.Label != null)