Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash when closing the macos app from full screen #2567

Merged
merged 3 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Sources/App/Scenes/WebViewSceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ final class WebViewSceneDelegate: NSObject, UIWindowSceneDelegate {
#endif
}

func sceneWillResignActive(_ scene: UIScene) {
#if targetEnvironment(macCatalyst)
WindowScenesManager.shared.sceneWillResignActive(scene)
#endif
}

func sceneDidDisconnect(_ scene: UIScene) {
windowController = nil
window = nil
Expand Down
15 changes: 13 additions & 2 deletions Sources/App/Scenes/WindowScenesManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,24 @@ final class WindowScenesManager {
startObservingScene(scene)
}

func sceneWillResignActive(_ scene: UIScene) {
stopObservingScene(scene)
}

func didDiscardScene(_ scene: UIScene) {
stopObservingScene(scene)
}

private func startObservingScene(_ scene: UIWindowScene) {
let observer = WindowSizeObserver(windowScene: scene)
windowSizeObservers.append(observer)
}

func didDiscardScene(_ scene: UIScene) {
windowSizeObservers.removeAll(where: { $0.observedScene == scene })
private func stopObservingScene(_ scene: UIScene) {
windowSizeObservers.first { observer in
observer.observedScene == scene
}?.stopObserving()
windowSizeObservers.removeAll { $0.observedScene == scene }
}

private func sceneFrameIsValid(_ sceneFrame: CGRect, screenSize: CGSize) -> Bool {
Expand Down
10 changes: 8 additions & 2 deletions Sources/App/Scenes/WindowSizeObserver.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Foundation
import Shared
import UIKit

final class WindowSizeObserver: NSObject {
Expand All @@ -8,9 +9,9 @@ final class WindowSizeObserver: NSObject {
init(windowScene: UIWindowScene) {
self.observedScene = windowScene
super.init()
#if targetEnvironment(macCatalyst)

guard Current.isCatalyst else { return }
startObserving()
#endif
}

private func startObserving() {
Expand All @@ -23,6 +24,11 @@ final class WindowSizeObserver: NSObject {
}
#endif
}

public func stopObserving() {
observation?.invalidate()
bgoncal marked this conversation as resolved.
Show resolved Hide resolved
observation = nil
}
}

enum ScenesWindowSizeConfig {
Expand Down