From c1f03343c8da0965ffb3229970b9afada562c4d7 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: Thu, 25 Oct 2018 02:00:37 +0300
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=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B?=
 =?UTF-8?q?=D1=82=D0=B8=D1=8F=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=BE=D0=B3=D0=BE,=20=D1=87=D1=82=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=8B=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=BC=D0=BE=D0=B3=20=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B5=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BD=D1=83=D1=82=D1=8C=D1=81=D1=8F=20=D0=BA=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eCompanies/MainWindow.xaml.cs  | 11 ++++++++---
 eCompanies/UsersWindow.xaml.cs | 10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/eCompanies/MainWindow.xaml.cs b/eCompanies/MainWindow.xaml.cs
index 521af02..85ea9ef 100644
--- a/eCompanies/MainWindow.xaml.cs
+++ b/eCompanies/MainWindow.xaml.cs
@@ -83,9 +83,14 @@ namespace eCompanies
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
 
-            MessageBoxResult mbr = MessageBox.Show("Вы закрываете приложение. Хотите сохранить результаты?", "Сохранение изменений", MessageBoxButton.YesNo);
-            if (mbr == MessageBoxResult.No)
-                return;
+            MessageBoxResult mbr = MessageBox.Show("Вы закрываете окно с компаниями. Хотите сохранить результаты?", "Сохранение изменений", MessageBoxButton.YesNoCancel);
+            switch (mbr)
+            {
+                case MessageBoxResult.No: return;
+                case MessageBoxResult.Cancel:
+                    e.Cancel = true;
+                    break;
+            }
             foreach (Company c in (ObservableCollection<Company>)companyGrid.DataContext)
             {
                 if (c.Name == null)
diff --git a/eCompanies/UsersWindow.xaml.cs b/eCompanies/UsersWindow.xaml.cs
index 0874ce2..fc25a04 100644
--- a/eCompanies/UsersWindow.xaml.cs
+++ b/eCompanies/UsersWindow.xaml.cs
@@ -34,9 +34,13 @@ namespace eCompanies
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            MessageBoxResult mbr = MessageBox.Show("Вы закрываете окно с компанией. Хотите сохранить результаты?", "Сохранение изменений", MessageBoxButton.YesNo);
-            if (mbr == MessageBoxResult.No)
-                return;
+            MessageBoxResult mbr = MessageBox.Show("Вы закрываете окно компании. Хотите сохранить результаты?", "Сохранение изменений", MessageBoxButton.YesNoCancel);
+            switch (mbr)
+            {
+                case MessageBoxResult.No: return;
+                case MessageBoxResult.Cancel: e.Cancel = true;
+                    break;
+            }
             currentCompany.Users.Clear();
             foreach (Users u in (ObservableCollection<Users>)usersGrid.DataContext)
             {