Skip to content

Fix terminal renderer crash during window reparenting #16789

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

Merged
austinywang merged 7 commits into from
Oct 2, 2026
Merged

Fix terminal renderer crash during window reparenting #16789

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6382f1f
fix: avoid unsafe main actor assumption in terminal window observers
austinywang Oct 2, 2026
9acb137
Merge remote-tracking branch 'origin/main' into issue-terminal-render…
austinywang Oct 2, 2026
11441ee
fix: restore shared Codex fork monitor arguments
austinywang Oct 2, 2026
90ba3b0
Fix unused Cloud port bindings
austinywang Oct 2, 2026
eda8fb9
Serialize shared fork routing and guard window visibility
austinywang Oct 2, 2026
65d677b
Align Cloud port tests with current presentation
austinywang Oct 2, 2026
eef2e1b
Merge origin/main into terminal renderer crash fix
austinywang Oct 2, 2026
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
12 changes: 9 additions & 3 deletions Sources/GhosttyTerminalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5364,8 +5364,13 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
queue: .main
) { [weak self] notification in
guard let occludedWindow = notification.object as? NSWindow else { return }
// Delivered on the main queue (`queue: .main`), which is the main actor.
MainActor.assumeIsolated {
// NotificationCenter's `queue: .main` selects the main operation
// queue, but it does not establish Swift concurrency's main-actor
// executor. AppKit can also post this notification during window
// teardown from a non-actor callback. Hop explicitly instead of
// assuming the executor, which otherwise traps with EXC_BAD_ACCESS
// while a terminal view is being detached.
Task { @MainActor [weak self] in
self?.applyRendererWindowVisibility(for: occludedWindow)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}
Expand All @@ -5379,7 +5384,7 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
queue: .main
) { [weak self] notification in
guard let keyWindow = notification.object as? NSWindow else { return }
MainActor.assumeIsolated {
Task { @MainActor [weak self] in
self?.applyRendererWindowVisibility(for: keyWindow)
}
})
Expand Down Expand Up @@ -9907,6 +9912,7 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
/// occlusion `.visible` bit is remembered per window so the rule can tell a
/// trustworthy occlusion verdict from a virtual display that never sets it.
private func applyRendererWindowVisibility(for window: NSWindow) {
guard let currentWindow = self.window, currentWindow === window else { return }
let occlusionVisible = window.occlusionState.contains(.visible)
if occlusionVisible {
Self.windowsThatReportedVisible.add(window)
Expand Down
Loading