From 6992a7df685abf89fde8974f8c825b9ebf39a4ee Mon Sep 17 00:00:00 2001
From: kotcheshir73 <kotcheshir73@gmail.com>
Date: Sat, 3 Apr 2021 10:50:51 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GenericControlEntityElement.cs            | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 });
+								}
 							}
 						}
 					}