Fix closing full-screen videos with the X button on macOS 14.4 and ab…

…ove (#2762) Task/Issue URL: https://app.asana.com/0/72649045549333/1206959015087322/f Description: Partially revert a fix to #1618 on macOS 14.4 and above because the original issue seems to be gone and that fix seemed to have started breaking full screen videos in macOS Sonoma 14.4 and above.
duckduckgo · May 9, 2024 · 30a663d · 30a663d
1 parent 567c062
commit 30a663d
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/DuckDuckGo/Tab/View/WebViewContainerView.swift b/DuckDuckGo/Tab/View/WebViewContainerView.swift
@@ -141,21 +141,23 @@ final class WebViewContainerView: NSView {
             }
             .store(in: &cancellables)
 
-        fullScreenWindowWillCloseCancellable = NotificationCenter.default.publisher(for: NSWindow.willCloseNotification, object: fullScreenWindow)
-            .sink { [weak self] notification in
-                self?.fullScreenWindowWillCloseCancellable = nil
-                let fullScreenWindowController = (notification.object as? NSWindow)?.windowController
-                DispatchQueue.main.async { [weak fullScreenWindowController] in
-                    guard let fullScreenWindowController else { return }
-                    // just in case.
-                    // if WKFullScreenWindowController receives `close()` the next time it‘s open it will crash because its _webView is nil
-                    // https://errors.duckduckgo.com/organizations/ddg/issues/3411/?project=6&referrer=release-issue-stream
-                    NSException.try {
-                        fullScreenWindowController.setValue(NSView(), forKeyPath: #keyPath(webView))
+        // https://app.asana.com/0/72649045549333/1206959015087322/f
+        if #unavailable(macOS 14.4) {
+            fullScreenWindowWillCloseCancellable = NotificationCenter.default.publisher(for: NSWindow.willCloseNotification, object: fullScreenWindow)
+                .sink { [weak self] notification in
+                    self?.fullScreenWindowWillCloseCancellable = nil
+                    let fullScreenWindowController = (notification.object as? NSWindow)?.windowController
+                    DispatchQueue.main.async { [weak fullScreenWindowController] in
+                        guard let fullScreenWindowController else { return }
+                        // just in case.
+                        // if WKFullScreenWindowController receives `close()` the next time it‘s open it will crash because its _webView is nil
+                        // https://errors.duckduckgo.com/organizations/ddg/issues/3411/?project=6&referrer=release-issue-stream
+                        NSException.try {
+                            fullScreenWindowController.setValue(NSView(), forKeyPath: #keyPath(webView))
+                        }
                     }
-
                 }
-            }
+        }
 
     }