diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-02 19:03:59 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-02 19:03:59 +0300 |
| commit | 2d340ef8bbbb5a1c7f3415da704a0b83c28c07b4 (patch) | |
| tree | e051087540ca37ab98c253075adf90b16fe6c665 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 327fe90a471c74a5723258ccbda7d9ade064b50c (diff) | |
| download | Tango-2d340ef8bbbb5a1c7f3415da704a0b83c28c07b4.tar.gz Tango-2d340ef8bbbb5a1c7f3415da704a0b83c28c07b4.zip | |
WOrking on PPC.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs | 13 |
1 files changed, 10 insertions, 3 deletions
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<NavigationControl>(); + } + } + else { - moduleNavigation = v.FindChildOffline<NavigationControl>(); + throw new ArgumentNullException("Could not navigate to " + fullPath); } } |