Skip to content

fix(recording): restore correct display selection after screen unlock #308

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
JerryZLiu merged 1 commit into from
Jul 17, 2026
Merged

fix(recording): restore correct display selection after screen unlock #308

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
58 changes: 41 additions & 17 deletions Dayflow/Dayflow/Core/Recording/ScreenRecorder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ final class ScreenRecorder: NSObject, @unchecked Sendable {
false, onScreenWindowsOnly: true)
cachedContent = content

// 2. Choose display: prefer requested → active → first
// 2. Choose display: prefer requested → active. Defer if preferred is missing from the snapshot.
let displaysByID: [CGDirectDisplayID: SCDisplay] = Dictionary(
uniqueKeysWithValues: content.displays.map { ($0.displayID, $0) }
)
Expand All @@ -242,20 +242,30 @@ final class ScreenRecorder: NSObject, @unchecked Sendable {
}
let preferredID = requestedDisplayID ?? trackerID

let display: SCDisplay
if let pid = preferredID, let scd = displaysByID[pid] {
display = scd
let display: SCDisplay?
if let pid = preferredID {
display = displaysByID[pid]
if display == nil {
requestedDisplayID = pid
dbg("setupCapture: preferred display \(pid) not in snapshot (count=\(content.displays.count)); deferring")
} else {
requestedDisplayID = nil
}
} else if let first = content.displays.first {
display = first
requestedDisplayID = nil
} else {
throw ScreenRecorderError.noDisplay
}

cachedDisplay = display
currentDisplayID = display.displayID
requestedDisplayID = nil
currentDisplayID = display?.displayID

dbg("Setup complete - display \(display.displayID) (\(display.width)x\(display.height))")
if let d = display {
dbg("Setup complete - display \(d.displayID) (\(d.width)x\(d.height))")
} else {
dbg("Setup complete - awaiting display availability")
}

// 3. Start capture timer
q.async { [weak self] in
Expand Down Expand Up @@ -470,17 +480,19 @@ final class ScreenRecorder: NSObject, @unchecked Sendable {
false, onScreenWindowsOnly: true)
cachedContent = content

// Prefer requested display (from active display tracking) over current
// Prefer requested display over current; hold if missing from snapshot.
let targetID = requestedDisplayID ?? currentDisplayID

if let id = targetID,
let display = content.displays.first(where: { $0.displayID == id })
{
cachedDisplay = display
currentDisplayID = id
if requestedDisplayID == id { requestedDisplayID = nil }
dbg("Switched to display \(id)")
} else if let first = content.displays.first {
if let id = targetID {
if let display = content.displays.first(where: { $0.displayID == id }) {
cachedDisplay = display
currentDisplayID = id
if requestedDisplayID == id { requestedDisplayID = nil }
dbg("Switched to display \(id)")
} else {
dbg("refreshDisplay: target \(id) not in snapshot (count=\(content.displays.count)); keeping current")
}
} else if let first = content.displays.first, cachedDisplay == nil {
cachedDisplay = first
currentDisplayID = first.displayID
}
Expand Down Expand Up @@ -546,7 +558,7 @@ final class ScreenRecorder: NSObject, @unchecked Sendable {
return
}

guard currentDisplayID != nil, state == .capturing else {
guard state == .capturing else {
dbg("Active display changed while not capturing – will switch on next start")
return
}
Expand All @@ -564,6 +576,18 @@ final class ScreenRecorder: NSObject, @unchecked Sendable {
let nc = NSWorkspace.shared.notificationCenter
let dnc = DistributedNotificationCenter.default()

// Screen configuration changed — recover any deferred display selection.
NotificationCenter.default.addObserver(
forName: NSApplication.didChangeScreenParametersNotification,
object: nil, queue: nil
) { [weak self] _ in
self?.q.async { [weak self] in
guard let self, self.state == .capturing else { return }
dbg("didChangeScreenParameters – refreshing display selection")
Task { await self.refreshDisplay() }
}
}

// System will sleep
nc.addObserver(
forName: NSWorkspace.willSleepNotification,
Expand Down