Merge pull request #1630 from MikelThief/master

Properly resolve viewmodels for particular views in UWP
PrismLibrary · Nov 23, 2018 · 136bb1e · 136bb1e
2 parents fd8cf68 + eba378f
commit 136bb1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Windows10/Prism.DryIoc.Windows/DryIocContainerExtension.cs b/Source/Windows10/Prism.DryIoc.Windows/DryIocContainerExtension.cs
@@ -51,7 +51,7 @@ public object Resolve(Type type, string name)
 
         public object ResolveViewModelForView(object view, Type viewModelType)
         {
-            if (view is Page page)
+            if (view is Page page && page.Frame != null)
             {
                 var service = NavigationService.Instances[page.Frame];
                 return Instance.Resolve(viewModelType, new[] { service });

diff --git a/Source/Windows10/Prism.Unity.Windows/UnityContainerExtension.cs b/Source/Windows10/Prism.Unity.Windows/UnityContainerExtension.cs
@@ -49,7 +49,7 @@ public object Resolve(Type type, string name)
 
         public object ResolveViewModelForView(object view, Type viewModelType)
         {
-            if (view is Page page)
+            if (view is Page page && page.Frame != null)
             {
                 var service = NavigationService.Instances[page.Frame];
                 ResolverOverride[] overrides = null;