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: override content::ContentMainDelegate::CreateContentClient() #35932

Merged
merged 2 commits into from Oct 10, 2022

Conversation

codebytere
Copy link
Member

Description of Change

Closes #35916.

Overrides content::ContentMainDelegate::CreateContentClient() to prevent duplicate creation. The previous code was added in Electron's infancy, and the override did not become available until 2019, which is why this hasn't yet been changed.

Checklist

Release Notes

Notes: Fixed a potential memory leak.

@codebytere codebytere added semver/patch backwards-compatible bug fixes target/20-x-y target/21-x-y PR should also be added to the "21-x-y" branch. target/22-x-y PR should also be added to the "22-x-y" branch. labels Oct 6, 2022
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Oct 6, 2022
Copy link
Member

@deepak1556 deepak1556 left a comment

Choose a reason for hiding this comment

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

LGTM with minor change

shell/app/electron_main_delegate.cc Outdated Show resolved Hide resolved
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Oct 7, 2022
@codebytere codebytere merged commit ebb866e into main Oct 10, 2022
@codebytere codebytere deleted the single-content-client branch October 10, 2022 14:48
@release-clerk
Copy link

release-clerk bot commented Oct 10, 2022

Release Notes Persisted

Fixed a potential memory leak.

@trop
Copy link
Contributor

trop bot commented Oct 10, 2022

I was unable to backport this PR to "20-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Oct 10, 2022

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

@trop trop bot added in-flight/22-x-y and removed target/22-x-y PR should also be added to the "22-x-y" branch. labels Oct 10, 2022
@trop
Copy link
Contributor

trop bot commented Oct 10, 2022

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

@trop trop bot added in-flight/21-x-y and removed target/21-x-y PR should also be added to the "21-x-y" branch. labels Oct 10, 2022
@trop trop bot added merged/21-x-y PR was merged to the "21-x-y" branch. merged/22-x-y PR was merged to the "22-x-y" branch. and removed in-flight/21-x-y labels Oct 11, 2022
khalwa pushed a commit to solarwindscloud/electron that referenced this pull request Feb 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged/21-x-y PR was merged to the "21-x-y" branch. merged/22-x-y PR was merged to the "22-x-y" branch. semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: The global content client will init twice on the startup
6 participants