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

[4.2] Fix crash when using incompatible versions of Godot Jolt #85779

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

mihe
Copy link
Contributor

@mihe mihe commented Dec 5, 2023

Related to #85576, #85580 and #85581.

As per the discussion on Rocket Chat, This introduces a somewhat hacky check to see if the GDExtension library being loaded has its filename beginning with godot_jolt_ and is also targeting a compatibility_minimum of 4.1, which indicates that it's a version that was never officially supported to work with Godot 4.2.

Note that this PR targets the 4.2 branch, since it seemed like this would/should be a temporary hack for 4.2 specifically.

Also note that this will technically reject Godot Jolt version 0.9.0 and 0.10.0, despite those technically being (somewhat) compatible with Godot 4.2.

Let me know what you think of the error message.

CC: @akien-mga @YuriSizov @dsnopek

@YuriSizov YuriSizov added this to the 4.3 milestone Dec 5, 2023
@YuriSizov YuriSizov added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Dec 5, 2023
@YuriSizov YuriSizov modified the milestones: 4.3, 4.2 Dec 5, 2023
@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Dec 5, 2023
Copy link
Contributor

@YuriSizov YuriSizov left a comment

Choose a reason for hiding this comment

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

Message looks good to me and I approve this conceptually. I'll let @dsnopek to double-check the GDExtension side of it.

@mihe mihe marked this pull request as ready for review December 5, 2023 12:44
@mihe mihe requested a review from a team as a code owner December 5, 2023 12:44
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for the quick patch :)

@mihe
Copy link
Contributor Author

mihe commented Dec 5, 2023

Seems to work fine on all three major platforms, as far as I can tell.

Copy link
Contributor

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good to me :-)

If we can get the "safe mode" and crash handler stuff we've talked about implemented for 4.3, then this hack shouldn't be needed there.

@YuriSizov YuriSizov merged commit 17888fb into godotengine:4.2 Dec 5, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@mihe mihe deleted the godot-jolt-crash branch December 5, 2023 14:10
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.

4 participants