fix sub window engine didn't shut down after window closed. close #123

MixinNetwork · Jul 27, 2022 · f33938c · f33938c
1 parent be4ae58
commit f33938c
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/packages/desktop_multi_window/macos/Classes/FlutterWindow.swift b/packages/desktop_multi_window/macos/Classes/FlutterWindow.swift
@@ -79,13 +79,25 @@ class FlutterWindow: BaseFlutterWindow {
     window.titleVisibility = .hidden
     window.titlebarAppearsTransparent = true
   }
-}
 
-extension FlutterWindow: NSWindowDelegate {
-  func windowWillClose(_ notification: Notification) {
+  deinit {
+    debugPrint("release window resource")
     window.delegate = nil
+    if let flutterViewController = window.contentViewController as? FlutterViewController {
+      flutterViewController.engine.shutDownEngine()
+    }
     window.contentViewController = nil
     window.windowController = nil
+  }
+}
+
+extension FlutterWindow: NSWindowDelegate {
+  func windowWillClose(_ notification: Notification) {
+    delegate?.onClose(windowId: windowId)
+  }
+
+  func windowShouldClose(_ sender: NSWindow) -> Bool {
     delegate?.onClose(windowId: windowId)
+    return true
   }
 }