Skip to content

Commit 086f7e6

Browse files
authored
Merge pull request #1145 from Yarwin/bugfix-set-is-valid-in-to-string
Properly set GDExtensionBool is_valid to true in `to_string` function.
2 parents 08f24dc + 3731729 commit 086f7e6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/composite/godot-install/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ runs:
4141
env:
4242
ARTIFACT_NAME: ${{ inputs.artifact-name }}
4343
# if: steps.cache-godot.outputs.cache-hit != 'true'
44-
# If a specific Godot revision should be used, rather than latest, use this:
45-
# curl https://nightly.link/Bromeon/godot4-nightly/actions/runs/4910907653/$ARTIFACT_NAME.zip \
4644
run: |
4745
if [[ $ARTIFACT_NAME == *"nightly"* ]]; then
4846
url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-nightly/master/$ARTIFACT_NAME.zip"
49-
# FIXME: re-enable latest as soon as https://github.com/godotengine/godot/issues/105834 is resolved.
50-
url="https://nightly.link/Bromeon/godot4-nightly/actions/runs/14632778165/$ARTIFACT_NAME.zip"
47+
# If a specific Godot revision should be used, rather than latest, use this:
48+
# url="https://nightly.link/Bromeon/godot4-nightly/actions/runs/<WORKFLOW_RUN_ID>/$ARTIFACT_NAME.zip"
5149
else
5250
url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-stable/master/$ARTIFACT_NAME.zip"
5351
fi

godot-core/src/registry/callbacks.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub unsafe extern "C" fn default_get_virtual<T: UserClass>(
188188

189189
pub unsafe extern "C" fn to_string<T: cap::GodotToString>(
190190
instance: sys::GDExtensionClassInstancePtr,
191-
_is_valid: *mut sys::GDExtensionBool,
191+
is_valid: *mut sys::GDExtensionBool,
192192
out_string: sys::GDExtensionStringPtr,
193193
) {
194194
// Note: to_string currently always succeeds, as it is only provided for classes that have a working implementation.
@@ -200,6 +200,7 @@ pub unsafe extern "C" fn to_string<T: cap::GodotToString>(
200200

201201
// Transfer ownership to Godot
202202
string.move_into_string_ptr(out_string);
203+
*is_valid = sys::conv::SYS_TRUE;
203204
}
204205

205206
#[cfg(before_api = "4.2")]

0 commit comments

Comments
 (0)