From 26d5b2b803d77f46bc1dacd716f86bfd23da7eb8 Mon Sep 17 00:00:00 2001 From: adrianknight89 Date: Wed, 30 Nov 2016 18:29:16 -0600 Subject: [PATCH] fix NRE in packager dispose (#561) --- Xamarin.Forms.Platform.Android/VisualElementPackager.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Xamarin.Forms.Platform.Android/VisualElementPackager.cs b/Xamarin.Forms.Platform.Android/VisualElementPackager.cs index 891d438..0ad1b42 100644 --- a/Xamarin.Forms.Platform.Android/VisualElementPackager.cs +++ b/Xamarin.Forms.Platform.Android/VisualElementPackager.cs @@ -52,10 +52,13 @@ namespace Xamarin.Forms.Platform.Android _childViews = null; } - _renderer.Element.ChildAdded -= _childAddedHandler; - _renderer.Element.ChildRemoved -= _childRemovedHandler; + if (_renderer.Element != null) + { + _renderer.Element.ChildAdded -= _childAddedHandler; + _renderer.Element.ChildRemoved -= _childRemovedHandler; - _renderer.Element.ChildrenReordered -= _childReorderedHandler; + _renderer.Element.ChildrenReordered -= _childReorderedHandler; + } _renderer = null; } } -- 2.7.4