8000 fix: remove conflicting RunFileChooserEnd for Mac by VerteDinde · Pull Request #30935 · electron/electron · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: remove conflicting RunFileChooserEnd for Mac #30935

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

Jump to bottom
Merged
merged 1 commit into from
Sep 13, 2021
Merged

fix: remove conflicting RunFileChooserEnd for Mac #30935

merged 1 commit into from
Sep 13, 2021

Conversation

VerteDinde
Copy link
Member
@VerteDinde VerteDinde commented Sep 13, 2021 •
edited
Loading

Description of Change

Follow up to #30916, which fixed the file picker crash for Windows and Linux, but regressed and caused the crash to start occurring on Mac.

RunFileChooserEnd does not need to run on Mac after selecting files and opening the dialog, because 1) on Mac only, we bind the ProcessSelectedFilesMac function to run and block the thread, and 2) RunFileChooserEnd is already run in ProcessSelectedFilesMac within file_select_helper_mac.mm at the appropriate time.

This PR gates the function to only run on non-Mac OSes.

Checklist

Release Notes

Notes: Fixed a crash when selecting and opening files in a native file dialog on Mac.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Sep 13, 2021 8000
@VerteDinde VerteDinde added 15-x-y semver/patch backwards-compatible bug fixes labels Sep 13, 2021
@MarshallOfSound MarshallOfSound added fast-track 🚅 Indicates that this PR is intended to bypass the 24 hour rule. Needs approval from Releases target/15-x-y and removed 15-x-y labels Sep 13, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Sep 13, 2021
@MarshallOfSound MarshallOfSound merged commit c74b9ff into main Sep 13, 2021
@MarshallOfSound MarshallOfSound deleted the file-open-mac-30858 branch September 13, 2021 22:10
@release-clerk
Copy link
release-clerk bot commented Sep 13, 2021

Release Notes Persisted

Notes: Fixed a crash when selecting and opening files in a native file dialog on Mac.

@trop trop bot mentioned this pull request Sep 13, 2021
Merged
@trop
Copy link
Contributor
trop bot commented Sep 13, 2021

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

@commit-lint commit-lint bot mentioned this pull request Nov 24, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codebytere codebytere codebytere approved these changes

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VerteDinde @codebytere @MarshallOfSound
0