#585 Use different approach in Window Manager

Caliburn-Micro · Apr 8, 2019 · 7d2cd98 · 7d2cd98
1 parent 1416e4a
commit 7d2cd98
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/Caliburn.Micro.Platform/Platforms/net46/WindowManager.cs b/src/Caliburn.Micro.Platform/Platforms/net46/WindowManager.cs
@@ -408,23 +408,22 @@ private async void Closing(object sender, CancelEventArgs e)
 
                 e.Cancel = true;
 
+                await Task.Yield();
+
                 var canClose = await guard.CanCloseAsync(CancellationToken.None);
+
+                if (!canClose)
+                    return;
 
-                if (canClose)
-                {
-                    actuallyClosing = true;
+                actuallyClosing = true;
 
-                    if (view.DialogResult != cachedDialogResult)
-                    {
-                        view.DialogResult = cachedDialogResult;
-                        view.Close();
-                    }
-                    else
-                    {
-                        e.Cancel = false;
-                    }
-
-
+                if (cachedDialogResult == null)
+                {
+                    view.Close();
+                }
+                else if (view.DialogResult != cachedDialogResult)
+                {
+                    view.DialogResult = cachedDialogResult;
                 }
             }
         }