[macOS] Fixes Crash of cxx destruction when App will terminate (flutt…

…er#29502)
engine-flutter-autoroll · Nov 3, 2021 · a926664 · a926664
1 parent b375bf8
commit a926664
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
@@ -254,6 +254,10 @@ static void CommonInit(FlutterViewController* controller) {
              selector:@selector(onAccessibilityStatusChanged:)
                  name:EnhancedUserInterfaceNotification
                object:nil];
+  [center addObserver:controller
+             selector:@selector(applicationWillTerminate:)
+                 name:NSApplicationWillTerminateNotification
+               object:nil];
 }
 
 - (instancetype)initWithCoder:(NSCoder*)coder {
@@ -557,6 +561,13 @@ - (void)dispatchMouseEvent:(NSEvent*)event phase:(FlutterPointerPhase)phase {
   }
 }
 
+- (void)applicationWillTerminate:(NSNotification*)notification {
+  if (!_engine) {
+    return;
+  }
+  [_engine shutDownEngine];
+}
+
 - (void)onAccessibilityStatusChanged:(NSNotification*)notification {
   if (!_engine) {
     return;