Fix flutter#26966 (flutter#7566)

eligt · Jan 24, 2019 · 31c7917 · 31c7917
1 parent 78b7b36
commit 31c7917
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -391,9 +391,9 @@ - (void)viewWillAppear:(BOOL)animated {
 
   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 @@ - (void)viewDidDisappear:(BOOL)animated {
   TRACE_EVENT0("flutter", "viewDidDisappear");
   [self surfaceUpdated:NO];
   [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.paused"];
-  [_engine.get() setViewController:nil];
   [super viewDidDisappear:animated];
 }