From 1a540e84aff0a528e43f25bcc297696798a79052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?=
 <itsmylivex@gmail.com>
Date: Sun, 28 Oct 2018 11:44:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0,=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=BD=D0=B5=D0=BB=D1=8C=D0=B7=D1=8F=20=D0=B1=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BE=20=D0=B2=D1=8B=D0=B9=D1=82=D0=B8=20=D0=B8=D0=B7=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=81=D1=81=D0=B8=D0=B8=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8,=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D0=B2=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D1=8B=20(=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B0=20=D1=81=20=D0=BF=D1=83=D1=81=D1=82?=
 =?UTF-8?q?=D1=8B=D0=BC=D0=B8=20=D1=8F=D1=87=D0=B5=D0=B9=D0=BA=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D0=B7=D1=8B=D0=B2=D0=B0=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=20fieldHasNotFilled)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eCompanies/MainWindow.xaml.cs  | 2 +-
 eCompanies/UsersWindow.xaml.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eCompanies/MainWindow.xaml.cs b/eCompanies/MainWindow.xaml.cs
index c14030d..9b97d9b 100644
--- a/eCompanies/MainWindow.xaml.cs
+++ b/eCompanies/MainWindow.xaml.cs
@@ -79,7 +79,7 @@ namespace eCompanies
             }
             foreach (Company c in (ObservableCollection<Company>)companyGrid.DataContext)
             {
-                if (c.Name == null)
+                if ((c.Name == null) && (c.dataGridRowStatus != DataGridRowStatus.REMOVED))
                     switch (App.fieldHasNotFilled())
                     {
                         case MessageBoxResult.No: return;
diff --git a/eCompanies/UsersWindow.xaml.cs b/eCompanies/UsersWindow.xaml.cs
index 2af3641..17f0024 100644
--- a/eCompanies/UsersWindow.xaml.cs
+++ b/eCompanies/UsersWindow.xaml.cs
@@ -42,7 +42,8 @@ namespace eCompanies
             currentCompany.Users.Clear();
             foreach (Users u in (ObservableCollection<Users>)usersGrid.DataContext)
             {
-                if (u.Login == null || u.Password == null || u.Name == null)
+                if ((u.Login == null || u.Password == null || u.Name == null) 
+                    && (u.dataGridRowStatus != DataGridRowStatus.REMOVED))
                     switch (App.fieldHasNotFilled())
                     {
                         case MessageBoxResult.No: return;