Closing main demo was wrong (TaskCanceledException)

MahApps · Jan 16, 2018 · 9071379 · 9071379
1 parent 3c2a9e2
commit 9071379
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/...mples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleWindows/CleanWindowDemo.xaml.cs b/...mples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleWindows/CleanWindowDemo.xaml.cs
@@ -40,8 +40,8 @@ private async void CleanWindowClosing(object sender, System.ComponentModel.Cance
                                  AnimateHide = false
                              };
             var result = await this.ShowMessageAsync(
-                "Quit application?",
-                "Sure you want to quit application?",
+                "Quit window?",
+                "Sure you want to quit this clean demo?",
                 MessageDialogStyle.AffirmativeAndNegative, mySettings);
 
             this.closeMe = result == MessageDialogResult.Affirmative;

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindow.xaml.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindow.xaml.cs
@@ -368,26 +368,35 @@ private void LaunchNavigationDemo(object sender, RoutedEventArgs e)
 
         private async void MetroWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (e.Cancel) return;
+            if (e.Cancel)
+            {
+                return;
+            }
+
             e.Cancel = !_shutdown && _viewModel.QuitConfirmationEnabled;
-            if (_shutdown) return;
+            if (!e.Cancel)
+            {
+                return;
+            }
 
             var mySettings = new MetroDialogSettings()
-            {
-                AffirmativeButtonText = "Quit",
-                NegativeButtonText = "Cancel",
-                AnimateShow = true,
-                AnimateHide = false
-            };
+                             {
+                                 AffirmativeButtonText = "Quit",
+                                 NegativeButtonText = "Cancel",
+                                 AnimateShow = true,
+                                 AnimateHide = false
+                             };
 
             var result = await this.ShowMessageAsync("Quit application?",
-                "Sure you want to quit application?",
-                MessageDialogStyle.AffirmativeAndNegative, mySettings);
+                                                     "Sure you want to quit application?",
+                                                     MessageDialogStyle.AffirmativeAndNegative, mySettings);
 
             _shutdown = result == MessageDialogResult.Affirmative;
 
             if (_shutdown)
+            {
                 Application.Current.Shutdown();
+            }
         }
 
         private MetroWindow testWindow;