Skip to content

Commit 0207414

Browse files
committed
Fix tooled script property values missing
1 parent bedb532 commit 0207414

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

ecmascript.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ ScriptInstance *ECMAScript::instance_create(Object *p_this) {
5656
instance->owner = p_this;
5757
instance->binder = binder;
5858
instance->ecma_object = ecma_instance;
59+
instance->ecma_class = cls;
5960
instance->owner->set_script_instance(instance);
6061
instances.insert(p_this);
6162
return instance;
@@ -99,6 +100,7 @@ Error ECMAScript::reload(bool p_keep_state) {
99100
} else {
100101
#ifdef TOOLS_ENABLED
101102
set_last_modified_time(FileAccess::get_modified_time(script_path));
103+
p_keep_state = true;
102104

103105
for (Set<Object *>::Element *E = instances.front(); E; E = E->next()) {
104106
Object *owner = E->get();

ecmascript_instance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ ScriptLanguage *ECMAScriptInstance::get_language() {
6464
ECMAScriptInstance::ECMAScriptInstance() {
6565
owner = NULL;
6666
binder = NULL;
67-
ecma_object.clear();
67+
ecma_class = NULL;
6868
}
6969

7070
ECMAScriptInstance::~ECMAScriptInstance() {

ecmascript_instance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ECMAScriptInstance : public ScriptInstance {
1414
Ref<ECMAScript> script;
1515
ECMAScriptGCHandler ecma_object;
1616
ECMAScriptBinder *binder;
17-
ECMAClassInfo *ecma_class;
17+
const ECMAClassInfo *ecma_class;
1818

1919
public:
2020
virtual bool set(const StringName &p_name, const Variant &p_value);

0 commit comments

Comments
 (0)