Merge pull request #596 from markgould/master

Fixes InvalidOperationException in WindowManager
Caliburn-Micro · Apr 6, 2019 · 1416e4a · 1416e4a
2 parents 772ed0b + 3e443b4
commit 1416e4a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Caliburn.Micro.Platform/Platforms/net46/WindowManager.cs b/src/Caliburn.Micro.Platform/Platforms/net46/WindowManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -417,9 +417,14 @@ private async void Closing(object sender, CancelEventArgs e)
                     if (view.DialogResult != cachedDialogResult)
                     {
                         view.DialogResult = cachedDialogResult;
+                        view.Close();
                     }
+                    else
+                    {
+                        e.Cancel = false;
+                    }
+
 
-                    view.Close();
                 }
             }
         }