From 2d340ef8bbbb5a1c7f3415da704a0b83c28c07b4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 2 Jul 2018 19:03:59 +0300 Subject: WOrking on PPC. --- .../PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs index d26f4d396..448fc0edc 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs @@ -171,11 +171,18 @@ namespace Tango.PPC.UI.Navigation await Task.Delay(100); var v = moduleNavigation.NavigateTo(view); - _currentVM = v.DataContext; + if (v != null) + { + _currentVM = v.DataContext; - if (view != path.Last()) + if (view != path.Last()) + { + moduleNavigation = v.FindChildOffline(); + } + } + else { - moduleNavigation = v.FindChildOffline(); + throw new ArgumentNullException("Could not navigate to " + fullPath); } } -- cgit v1.3.1