Only set Window.Content when null. Resolves #224

Caliburn-Micro · Nov 16, 2015 · c437f13 · c437f13
1 parent c59a82b
commit c437f13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs b/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs
@@ -229,7 +229,7 @@ protected void DisplayRootView(Type viewType, object paramter = null) {
             RootFrame.Navigate(viewType, paramter);
 
             // Seems stupid but observed weird behaviour when resetting the Content
-            if (Window.Current.Content != RootFrame)
+            if (Window.Current.Content == null)
                 Window.Current.Content = RootFrame;
 
             Window.Current.Activate();

diff --git a/src/Caliburn.Micro.Platform/win8/INavigationService.cs b/src/Caliburn.Micro.Platform/win8/INavigationService.cs
@@ -479,7 +479,7 @@ public virtual bool ResumeState() {
 
             BindViewModel(view);
 
-            if (Window.Current.Content != frame)
+            if (Window.Current.Content == null)
                 Window.Current.Content = frame;
 
             Window.Current.Activate();