summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.iOS
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2017-05-24 17:29:09 (GMT)
committerJason Smith <jason.smith@xamarin.com>2017-05-24 17:29:09 (GMT)
commit8f7b1f7f17f462caa05b84a96ea23ba622c1b771 (patch)
tree1322c0377ddc603326ce30102ebb85b70370001f /Xamarin.Forms.Platform.iOS
parentcd61a94c5e2f16c4423bbb1e8b7b74287f491984 (diff)
downloadxamarin-forms-8f7b1f7f17f462caa05b84a96ea23ba622c1b771.zip
xamarin-forms-8f7b1f7f17f462caa05b84a96ea23ba622c1b771.tar.gz
xamarin-forms-8f7b1f7f17f462caa05b84a96ea23ba622c1b771.tar.bz2
[iOS] Handle user popping pages out of order (#934)
* [iOS] Handle when user can call pop a page that was already disposed/removed * [Controls] Fix bug number
Diffstat (limited to 'Xamarin.Forms.Platform.iOS')
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
index 99ff079..829167b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
@@ -525,7 +525,7 @@ namespace Xamarin.Forms.Platform.iOS
void RemoveViewControllers(bool animated)
{
var controller = TopViewController as ParentingViewController;
- if (controller == null || controller.Child == null)
+ if (controller == null || controller.Child == null || Platform.GetRenderer(controller.Child) == null)
return;
// Gesture in progress, lets not be proactive and just wait for it to finish