Skip to content

Retiring a recoverable window route recurses until the stack overflows #12621

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.

Sign up for GitHub

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

Closed
ejc3 wants to merge 1 commit into from
Closed

Retiring a recoverable window route recurses until the stack overflows #12621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Sources/AppDelegate+RecoverableMainWindowRoutes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,18 @@ extension AppDelegate {
private func recoverableMainWindowRouteSnapshot(
for route: RecoverableMainWindowRoute
) -> MainWindowRouteSnapshot? {
let cachedWindow = route.window ?? windowForMainWindowId(route.windowId)
// Check the manager before resolving the window. Resolving the window
// retires a route whose manager cannot own it, and retirement looks up
// workspace owners through this snapshot again.
guard let manager = route.tabManager,
tabManagerCanOwnRecoverableMainWindowRoute(manager),
let window = liveRecoverableMainWindow(
windowId: route.windowId,
cachedWindow: cachedWindow
) else {
tabManagerCanOwnRecoverableMainWindowRoute(manager) else {
return nil
}
let cachedWindow = route.window ?? windowForMainWindowId(route.windowId)
guard let window = liveRecoverableMainWindow(
windowId: route.windowId,
cachedWindow: cachedWindow
) else {
return nil
}
route.window = window
Expand Down
Loading