diff --git a/Naxam.TopTabbedPage.Platform.iOS/TopTabbedRenderer.cs b/Naxam.TopTabbedPage.Platform.iOS/TopTabbedRenderer.cs index 8ffde1c..948414c 100644 --- a/Naxam.TopTabbedPage.Platform.iOS/TopTabbedRenderer.cs +++ b/Naxam.TopTabbedPage.Platform.iOS/TopTabbedRenderer.cs @@ -221,7 +221,10 @@ void OnPropertyChanged(object sender, PropertyChangedEventArgs e) { var current = Tabbed.CurrentPage; if (current == null) + { + lastSelectedIndex = -1; return; + } var controller = GetViewController(current); if (controller == null) @@ -310,6 +313,9 @@ void SetupPage(Page page, int index) void TeardownPage(Page page, int index) { + if (lastSelectedIndex == index) + lastSelectedIndex = -1; + page.PropertyChanged -= OnPagePropertyChanged; Platform.SetRenderer(page, null);