Keep engine alive if VC is not deallocated (flutter#7544)

agd · Jan 22, 2019 · 2123d3a · 2123d3a
1 parent 88fee08
commit 2123d3a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
@@ -144,13 +144,15 @@ - (void)setViewController:(FlutterViewController*)viewController {
   FML_DCHECK(self.iosPlatformView);
   _viewController = [viewController getWeakPtr];
   self.iosPlatformView->SetOwnerViewController(_viewController);
-  if (!viewController && !_allowHeadlessExecution) {
+  [self maybeSetupPlatformViewChannels];
+}
+
+- (void)notifyViewControllerDeallocated {
+  if (!_allowHeadlessExecution) {
     [self resetChannels];
 
     _shell.reset();
     _threadHost.Reset();
-  } else {
-    [self maybeSetupPlatformViewChannels];
   }
 }
 

diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
@@ -43,6 +43,7 @@
 - (FlutterTextInputPlugin*)textInputPlugin;
 - (void)launchEngine:(NSString*)entrypoint libraryURI:(NSString*)libraryOrNil;
 - (BOOL)createShell:(NSString*)entrypoint libraryURI:(NSString*)libraryOrNil;
+- (void)notifyViewControllerDeallocated;
 
 @end
 

diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -430,6 +430,7 @@ - (void)viewDidDisappear:(BOOL)animated {
 }
 
 - (void)dealloc {
+  [_engine.get() notifyViewControllerDeallocated];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }