From de191d5476c9df05901f333d3d22fa0853346fca Mon Sep 17 00:00:00 2001
From: Dan Field <dfield@gmail.com>
Date: Thu, 24 Jan 2019 12:36:23 -0800
Subject: [PATCH] Fix #26966 (flutter/engine#7566)

---
 .../darwin/ios/framework/Source/FlutterViewController.mm       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
index 8df2f3b61db..2e4a265d17f 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -391,9 +391,9 @@
 
   if (_engineNeedsLaunch) {
     [_engine.get() launchEngine:nil libraryURI:nil];
+    [_engine.get() setViewController:self];
     _engineNeedsLaunch = NO;
   }
-  [_engine.get() setViewController:self];
 
   // Only recreate surface on subsequent appearances when viewport metrics are known.
   // First time surface creation is done on viewDidLayoutSubviews.
@@ -425,7 +425,6 @@
   TRACE_EVENT0("flutter", "viewDidDisappear");
   [self surfaceUpdated:NO];
   [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.paused"];
-  [_engine.get() setViewController:nil];
   [super viewDidDisappear:animated];
 }