diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs index 2bb342e..3d8a335 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs @@ -84,19 +84,22 @@ namespace DesktopTools.Controls try { _element = value; - SetValues?.Invoke(_element); - if (tabControl.Visible) + if (_element != null) { - foreach (TabPage page in tabControl.TabPages) + SetValues?.Invoke(_element); + if (tabControl.Visible) { - if (page.Name == tabPageMain.Name) + foreach (TabPage page in tabControl.TabPages) { - continue; - } - if (page.Controls[0] is IControlChildEntity cntrl) - { - cntrl.ParentId = _element.Id; - cntrl.Open(new ControlOpenModel { OpenMode = ControlOpenMode.Child }); + if (page.Name == tabPageMain.Name) + { + continue; + } + if (page.Controls[0] is IControlChildEntity cntrl) + { + cntrl.ParentId = _element.Id; + cntrl.Open(new ControlOpenModel { OpenMode = ControlOpenMode.Child }); + } } } }