Skip to content
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.

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

fix: add resource strings for file selection #31881

Merged
merged 1 commit into from Nov 17, 2021
Merged

Conversation

VerteDinde
Copy link
Member

Description of Change

Fixes #31854

In Electron 16, we refactored the file select helper for file dialogs, but we also need to include the strings in our resource bundle for the description ids for custom file types and media files. This PR adds those strings to electron_resources and uses electron_resources.h rather than Chrome's generated_resources.h.

Checklist

Release Notes

Notes: Fixed a potential crash when importing media files or custom file types.

@VerteDinde VerteDinde added semver/patch backwards-compatible bug fixes target/16-x-y labels Nov 17, 2021
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Nov 17, 2021
@VerteDinde VerteDinde added the fast-track 🚅 Indicates that this PR is intended to bypass the 24 hour rule. Needs approval from Releases label Nov 17, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Nov 17, 2021
@VerteDinde VerteDinde merged commit 0cb46a3 into main Nov 17, 2021
@VerteDinde VerteDinde deleted the fix-file-import-strings branch November 17, 2021 22:13
@release-clerk
Copy link

release-clerk bot commented Nov 17, 2021

Release Notes Persisted

Fixed a potential crash when importing media files or custom file types.

@trop
Copy link
Contributor

trop bot commented Nov 17, 2021

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

@trop
Copy link
Contributor

trop bot commented Nov 17, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fast-track 🚅 Indicates that this PR is intended to bypass the 24 hour rule. Needs approval from Releases semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Opening a file chooser dialog crashes Ferdi on electron 16.0.0 on macos
3 participants