Skip to content

fix: wait for user selection on delegated lists in desktopCapturer#51674

Merged
jkleinsc merged 1 commit into
electron:mainfrom
aiddya:delegated-lists-fix
May 27, 2026
Merged

fix: wait for user selection on delegated lists in desktopCapturer#51674
jkleinsc merged 1 commit into
electron:mainfrom
aiddya:delegated-lists-fix

Conversation

@aiddya

@aiddya aiddya commented May 17, 2026

Copy link
Copy Markdown
Contributor

Description of Change

Delegated source lists signal user selection using OnDelegatedSourceListSelection, not OnSourceAdded. BaseCapturerPipeWire adds a placeholder source to preserve the interface shape, but it doesn't mean anything. Ignore OnSourceAdded and don't timeout after 3 seconds in case of delegated lists.

Fixes #51673

Checklist

Release Notes

Notes: Fixed desktopCapturer thumbnail generation and premature portal timeout on Linux with Wayland.

@electron-cation electron-cation Bot added the new-pr 🌱 PR opened recently label May 17, 2026
@aiddya

aiddya commented May 17, 2026

Copy link
Copy Markdown
Contributor Author

This should be backported to 42-x-y and 43-x-y.

Delegated source lists signal user selection using
`OnDelegatedSourceListSelection`, not `OnSourceAdded`. `BaseCapturerPipeWire`
adds a placeholder source to preserve the interface shape, but it doesn't
mean anything. Ignore `OnSourceAdded` and don't timeout after 3 seconds in case
of delegated lists.

Assisted-By: Claude Opus 4.7, Claude Code
@aiddya aiddya force-pushed the delegated-lists-fix branch from 228df52 to 94d7a21 Compare May 17, 2026 22:12
@nikwen nikwen requested a review from ckerr May 18, 2026 14:38
@jkleinsc jkleinsc added target/42-x-y PR should also be added to the "42-x-y" branch. target/43-x-y PR should also be added to the "43-x-y" branch. labels May 20, 2026
@ckerr ckerr added the semver/patch backwards-compatible bug fixes label May 21, 2026
@electron-cation electron-cation Bot added new-pr 🌱 PR opened recently and removed new-pr 🌱 PR opened recently labels May 21, 2026

@ckerr ckerr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the fix!

@jkleinsc jkleinsc merged commit d0b81c9 into electron:main May 27, 2026
140 of 142 checks passed
@release-clerk

release-clerk Bot commented May 27, 2026

Copy link
Copy Markdown

Release Notes Persisted

Fixed desktopCapturer thumbnail generation and premature portal timeout on Linux with Wayland.

@trop

trop Bot commented May 27, 2026

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "43-x-y", please check out #51783

@trop trop Bot added in-flight/43-x-y and removed target/43-x-y PR should also be added to the "43-x-y" branch. labels May 27, 2026
@trop

trop Bot commented May 27, 2026

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "42-x-y", please check out #51784

@trop trop Bot added in-flight/42-x-y merged/43-x-y PR was merged to the "43-x-y" branch. and removed target/42-x-y PR should also be added to the "42-x-y" branch. in-flight/43-x-y labels May 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in-flight/42-x-y merged/43-x-y PR was merged to the "43-x-y" branch. semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

desktopCapturer.getSources() has regressed on Linux with Wayland

3 participants