superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: weak self for event monitor to avoid retain cycle for controllers 

Fixes #3219

We were holding a reference cycle to the base terminal controller. This
was preventing the window from ever being fully deallocated.
pull/4128/head
Mitchell Hashimoto 2024-12-30 13:43:48 -08:00
parent d54817607c
commit dd41a9447d
No known key found for this signature in database
GPG Key ID: 523D5DC389D273BC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macos/Sources/Features/Terminal/BaseTerminalController.swift
View File

@ -111,8 +111,8 @@ class BaseTerminalController: NSWindowController,
// Listen for local events that we need to know of outside of // Listen for local events that we need to know of outside of
// single surface handlers. // single surface handlers.
self.eventMonitor = NSEvent.addLocalMonitorForEvents( self.eventMonitor = NSEvent.addLocalMonitorForEvents(
matching: [.flagsChanged], matching: [.flagsChanged]
handler: localEventHandler) ) { [weak self] event in self?.localEventHandler(event) }
} }
deinit { deinit {
@ -160,7 +160,7 @@ class BaseTerminalController: NSWindowController,
} }
// MARK: Notifications // MARK: Notifications
@objc private func didChangeScreenParametersNotification(_ notification: Notification) { @objc private func didChangeScreenParametersNotification(_ notification: Notification) {
// If we have a window that is visible and it is outside the bounds of the // If we have a window that is visible and it is outside the bounds of the
// screen then we clamp it back to within the screen. // screen then we clamp it back to within the screen.