From 30caf79c4e4a5a4f25383de2ddc6dae8a3d5eaa1 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 29 Oct 2018 16:36:28 -0700 Subject: [PATCH] Fix popSystemNavigator (flutter/engine#6691) --- .../darwin/ios/framework/Source/FlutterPlatformPlugin.mm | 2 -- 1 file changed, 2 deletions(-) diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm index fb52763303e..71940926f4a 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm +++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm @@ -203,12 +203,10 @@ using namespace shell; UIViewController* viewController = [UIApplication sharedApplication].keyWindow.rootViewController; if ([viewController isKindOfClass:[UINavigationController class]]) { [((UINavigationController*)viewController) popViewControllerAnimated:NO]; - [_engine.get() setViewController:nil]; } else { auto engineViewController = static_cast([_engine.get() viewController]); if (engineViewController != viewController) { [engineViewController dismissViewControllerAnimated:NO completion:nil]; - [_engine.get() setViewController:nil]; } } }