Fix crash when closing the macos app from full screen

home-assistant · Feb 1, 2024 · f1fd1e6 · f1fd1e6
1 parent 3ebd1e6
commit f1fd1e6
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Sources/App/Scenes/WindowSizeObserver.swift b/Sources/App/Scenes/WindowSizeObserver.swift
@@ -1,27 +1,26 @@
 import Foundation
+import Shared
 import UIKit
 
 final class WindowSizeObserver: NSObject {
     @objc private(set) var observedScene: UIWindowScene?
-    private var observation: NSKeyValueObservation?
+    private weak var observation: NSKeyValueObservation?
 
     init(windowScene: UIWindowScene) {
         self.observedScene = windowScene
         super.init()
-        #if targetEnvironment(macCatalyst)
+
+        guard Current.isCatalyst else { return }
         startObserving()
-        #endif
     }
 
     private func startObserving() {
-        #if targetEnvironment(macCatalyst)
         guard #available(macCatalyst 16.0, *) else { return }
         observation = observe(\.observedScene?.effectiveGeometry, options: [.new]) { _, change in
             guard let newSystemFrame = change.newValue??.systemFrame,
                   newSystemFrame.size != .zero, newSystemFrame.origin != .zero else { return }
             ScenesWindowSizeConfig.defaultSceneLatestSystemFrame = newSystemFrame
         }
-        #endif
     }
 }