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 crash when editing pinned StyleBox #61071

Merged
merged 1 commit into from
May 16, 2022

Conversation

timothyqiu
Copy link
Member

Fixes #61053

Other theme items may be reusing the leading/pinned StyleBox. Don't propagate changes into itself.

@timothyqiu timothyqiu added bug topic:editor crash cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.4 labels May 16, 2022
@timothyqiu timothyqiu added this to the 4.0 milestone May 16, 2022
@akien-mga akien-mga requested a review from YuriSizov May 16, 2022 06:11
@YuriSizov
Copy link
Contributor

Memory a bit fuzzy, but by looking at code alone, I think you can just replace the check above with it. It was trying to do a similar thing but at a smaller scope.

I'd also appreciate a short comment to explain the exclusion (e.g. "Avoid itself, stylebox can be shared between items").

@akien-mga akien-mga merged commit 75e4d24 into godotengine:master May 16, 2022
@akien-mga
Copy link
Member

Thanks!

@timothyqiu timothyqiu deleted the leading-stylebox branch May 16, 2022 12:03
@akien-mga
Copy link
Member

Cherry-picked for 3.5.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label May 16, 2022
@akien-mga
Copy link
Member

Cherry-picked for 3.4.5.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash when editing pinned StyleBox
3 participants