Skip to content

Commit 8817a9f

Browse files
authored
Merge pull request #122 from zw7u9tru/fishythings
Fix bug in previous release for 3.4.4
2 parents ded6777 + e979112 commit 8817a9f

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

.github/workflows/on_tag.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
var downloaded_files = [];
1717
var seen_completed_wfs = [];
1818
var expected_to_see = 7;
19-
while (total_slept < 3600000 && seen_completed_wfs.length < expected_to_see) {
19+
while (total_slept < 7200000 && seen_completed_wfs.length < expected_to_see) {
2020
var all_workflows = await github.rest.actions.listWorkflowRunsForRepo({
2121
owner: context.repo.owner,
2222
repo: context.repo.repo,

SCsub

-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ if env['tools']:
7272
fh.write(base_text.format(*subs))
7373
env_module.add_source_files(env.modules_sources, fn)
7474

75-
if env.msvc:
76-
# MSVC doesn't have clear C standard support, /std only covers C++.
77-
# We apply it to CCFLAGS (both C and C++ code) in case it impacts C features.
78-
env_module.Append(CCFLAGS=["/std:c++latest"])
79-
8075

8176
env_module.Append(CPPPATH=["#modules/ECMAScript"])
8277
env_module.add_source_files(env.modules_sources, sources)

quickjs/quickjs_binder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ void QuickJSBinder::add_godot_classes() {
10261026
}
10271027
JS_DefinePropertyValueStr(ctx, godot_object, data.jsclass.class_name, data.constructor, flags);
10281028
if (data.base_class) {
1029-
JS_SetPrototype(ctx, data.constructor, data.base_class->constructor);
1029+
JS_SetPrototype(ctx, data.prototype, data.base_class->prototype);
10301030
} else {
10311031
JS_SetPrototype(ctx, data.prototype, godot_origin_class.prototype);
10321032
}

0 commit comments

Comments
 (0)