Corrected WP NavigationController to avoid view model stack desync

madd0 · Dec 13, 2013 · 9624600 · 9624600
1 parent 885c7d3
commit 9624600
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/WygwamToolkit.Phone/NavigationController.cs b/WygwamToolkit.Phone/NavigationController.cs
@@ -162,6 +162,12 @@ protected override bool IsViewModelRegistered(Type viewModelType)
 
         private void OnFrameNavigated(object sender, System.Windows.Navigation.NavigationEventArgs e)
         {
+            // navigating to null means that we've navigated outside the app, no need to touch our internal stack
+            if (e.Content == null)
+            {
+                return;
+            }
+
             var navigationTarget = e.Content as FrameworkElement;
 
             if (e.NavigationMode == NavigationMode.Back)