summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.WinRT
diff options
context:
space:
mode:
authorPaul DiPietro <pauldipietro@users.noreply.github.com>2017-05-15 11:57:28 -0400
committerRui Marinho <me@ruimarinho.net>2017-05-15 16:57:28 +0100
commitb9b97c44822212a45cd4be7ba88032f940f81249 (patch)
tree03ce069c73d14f438571b0fda52cb8fb04a341c4 /Xamarin.Forms.Platform.WinRT
parenta0801dc345a4cc67cf44004b263eac46b8b89c72 (diff)
downloadxamarin-forms-b9b97c44822212a45cd4be7ba88032f940f81249.tar.gz
xamarin-forms-b9b97c44822212a45cd4be7ba88032f940f81249.tar.bz2
xamarin-forms-b9b97c44822212a45cd4be7ba88032f940f81249.zip
Adjust unhook location from PR #901 (#923)
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
-rw-r--r--Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
index bea7c485..5c38ec26 100644
--- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
@@ -218,6 +218,11 @@ namespace Xamarin.Forms.Platform.WinRT
_container.SizeChanged -= OnNativeSizeChanged;
_container.BackClicked -= OnBackClicked;
+#if WINDOWS_UWP
+ if (_parentTabbedPage != null)
+ Element.Appearing -= OnElementAppearing;
+#endif
+
SetElement(null);
SetPage(null, false, true);
_previousPage = null;
@@ -229,9 +234,6 @@ namespace Xamarin.Forms.Platform.WinRT
_parentMasterDetailPage.PropertyChanged -= MultiPagePropertyChanged;
#if WINDOWS_UWP
- if (_parentTabbedPage != null)
- Element.Appearing -= OnElementAppearing;
-
if (_navManager != null)
{
_navManager.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed;