From a64333e29ea6138bc9adf0346e724f155eae3bc9 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 12 Oct 2016 12:54:47 +0100 Subject: [Android] Fix possible NRE when detaching NavigationPageRenderer (#415) --- Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Xamarin.Forms.Platform.Android') diff --git a/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs index 3fbfa096..c02dc42b 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs @@ -74,13 +74,13 @@ namespace Xamarin.Forms.Platform.Android protected override void OnAttachedToWindow() { base.OnAttachedToWindow(); - PageController.SendAppearing(); + PageController?.SendAppearing(); } protected override void OnDetachedFromWindow() { base.OnDetachedFromWindow(); - PageController.SendDisappearing(); + PageController?.SendDisappearing(); } protected override void OnElementChanged(ElementChangedEventArgs e) @@ -145,7 +145,7 @@ namespace Xamarin.Forms.Platform.Android void InsertPageBefore(Page page, Page before) { - int index = ((IPageController)Element).InternalChildren.IndexOf(before); + int index = PageController.InternalChildren.IndexOf(before); if (index == -1) throw new InvalidOperationException("This should never happen, please file a bug"); -- cgit v1.2.3