Skip to content

fix(mac): ignore stale picks from Apple's system picker #1370

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
EtienneLescot merged 1 commit into from
Oct 24, 2026
Merged

fix(mac): ignore stale picks from Apple's system picker #1370

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
27 changes: 26 additions & 1 deletion ...tron/native/screencapturekit/Sources/OpenScreenScreenCaptureKitHelper/PickerSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ final class PickerSession: NSObject, SCContentSharingPickerObserver, @unchecked
private var picked: PickedSource?
/// Whether the picker, as last shown, left out the whole app that owns this helper.
private var presentedExcludesApp = false
/// Whether a `present` is waiting for its answer. While the shared picker is active,
/// macOS can deliver a selection outside any presentation of ours (the menu-bar
/// sharing item, or a pick replayed from an earlier session): that is not an answer to
/// anything the app asked, and reporting it recorded a window nobody chose (#1013).
private var awaitingPick = false
private var recorder: ScreenCaptureRecorder?

func run() -> Never {
Expand Down Expand Up @@ -107,9 +112,17 @@ final class PickerSession: NSObject, SCContentSharingPickerObserver, @unchecked
configuration.excludedBundleIDs = [notificationCenterBundleID] + [appBundleID].compactMap { $0 }
presentedExcludesApp = appBundleID != nil

// Off, then on: the shared picker keeps its state across presentations, and a
// picker left active from an earlier pick can hand that pick back as a new answer
// (#1013). Each presentation starts from a fresh activation -- unless a take is
// running, whose stream deactivating the picker could end.
let picker = SCContentSharingPicker.shared
if recorder == nil {
picker.isActive = false
}
picker.defaultConfiguration = configuration
picker.isActive = true
awaitingPick = true
picker.present()
emit(["event": "picker-presented"])
}
Expand All @@ -126,14 +139,16 @@ final class PickerSession: NSObject, SCContentSharingPickerObserver, @unchecked
DispatchQueue.main.async {
// A cancel for a running stream is the user stopping it from the menu bar, which
// the take's own stop path already reports.
if stream == nil {
if stream == nil, self.awaitingPick {
self.awaitingPick = false
emit(["event": "picker-cancelled"])
}
}
}

func contentSharingPickerStartDidFailWithError(_ error: Error) {
DispatchQueue.main.async {
self.awaitingPick = false
emit([
"event": "picker-failed",
"message": "\(error)",
Expand All @@ -147,6 +162,16 @@ final class PickerSession: NSObject, SCContentSharingPickerObserver, @unchecked
guard stream == nil else {
return
}
// A pick nobody asked for must not replace the retained one either.
guard awaitingPick else {
emit([
"event": "warning",
"code": "picker-unrequested-pick",
"message": "Ignored a picker selection made outside a presentation.",
])
return
}
awaitingPick = false

let display = filter.includedDisplays.first
let window = filter.includedWindows.first
Expand Down
Loading