Эх сурвалжийг харах

Fixed null pointer exception

jancoow 10 жил өмнө
parent
commit
0aa4482b77

+ 1 - 1
Breda-Tour/MapScreen/MapPage.xaml.cs

@@ -142,7 +142,7 @@ namespace Breda_Tour.MapScreen
                 {
                     if (x + 1 == int.Parse(Icon.Title))
                     {
-                        MainPage.RootFrame.Navigate(typeof(WpDetailPage), route.Waypoints.ElementAt(x));
+                        MainPage.RootFrame.Navigate(typeof(WpDetailPage), new Tuple < Waypoint, Route >(route.Waypoints.ElementAt(x), route));
                     }
                 }
             }

+ 5 - 2
Breda-Tour/MapScreen/WpDetailPage.xaml.cs

@@ -27,6 +27,7 @@ namespace Breda_Tour.MapScreen
     public sealed partial class WpDetailPage : Page
     {
         private Waypoint wp;
+        private Route route;
         public double Width { get; }
 
         public WpDetailPage()
@@ -37,7 +38,9 @@ namespace Breda_Tour.MapScreen
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            wp = e.Parameter as Waypoint;
+            Tuple<Waypoint, Route> t = (Tuple < Waypoint, Route>) e.Parameter;
+            wp = t.Item1;
+            route = t.Item2;
             this.DataContext = wp;
             if (wp.FromPreview)
             {
@@ -55,7 +58,7 @@ namespace Breda_Tour.MapScreen
         {
             e.Handled = true;
             SystemNavigationManager.GetForCurrentView().BackRequested -= RouteExample_BackRequested;
-            MainPage.RootFrame.Navigate(typeof(RouteExample));
+            MainPage.RootFrame.Navigate(typeof(RouteExample), route);
         }
 
         private void MainPage_BackRequested(object sender, BackRequestedEventArgs e)

+ 2 - 1
Breda-Tour/RouteSelectScreen/RouteExample.xaml.cs

@@ -109,7 +109,8 @@ namespace Breda_Tour.RouteSelectScreen
         {
             Waypoint wp = e.ClickedItem as Waypoint;
             wp.FromPreview = true;
-            MainPage.RootFrame.Navigate(typeof(WpDetailPage),wp);
+            Tuple<Waypoint, Route> t = new Tuple<Waypoint, Route>(wp, route);
+            MainPage.RootFrame.Navigate(typeof(WpDetailPage),t);
         }
     }
 }