瀏覽代碼

Prevented crash in DFLookupControl

Kenric Nugteren 1 年之前
父節點
當前提交
f1d3a7a824
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      inabox.wpf/DigitalForms/Designer/Controls/Fields/DFLookupControl.cs

+ 4 - 2
inabox.wpf/DigitalForms/Designer/Controls/Fields/DFLookupControl.cs

@@ -142,9 +142,11 @@ namespace InABox.DynamicGrid
             var lookup = lookups!.FirstOrDefault(x => x.Key == value);
             Combo.SelectedItem = lookup;
 
+            var combo = lookup.Value;
+
             _value.ID = lookup.Key;
-            _value.Text = _value.ID != Guid.Empty ? lookup.Value.Item1 : "";
-            _value.Values = lookup.Value.Item2;
+            _value.Text = _value.ID != Guid.Empty ? combo?.Item1 ?? "" : "";
+            _value.Values = combo?.Item2 ?? new Dictionary<string, object?>();
         }
         protected override bool IsEmpty() => Combo.SelectedValue == null || (Guid)Combo.SelectedValue == Guid.Empty;
     }