diff options
| author | Karroffel <therzog@mail.de> | 2017-04-24 18:51:39 +0200 |
|---|---|---|
| committer | Karroffel <therzog@mail.de> | 2017-04-24 19:26:32 +0200 |
| commit | 67886bab1eb0599ec724192a4298c980e6107f2a (patch) | |
| tree | 95809b2091df3384f33d96e6d1e204636408dc96 /modules/gdscript | |
| parent | b6e0eaf3ca74d9777c6869d8519db6264866d1e6 (diff) | |
fixed a bug where saving a GDScript file crashed the editor
I changed the loop in #8502, turns out it fixed the error I was facing but introduced a new one. This fixes both
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index fe20a842cf..173014b138 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1696,9 +1696,9 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so //same thing for placeholders #ifdef TOOLS_ENABLED - for (Set<PlaceHolderScriptInstance *>::Element *P = E->get()->placeholders.front(); P; P = P->next()) { + while (E->get()->placeholders.size()) { + Object *obj = E->get()->placeholders.front()->get()->get_owner(); - Object *obj = P->get()->get_owner(); //save instance info List<Pair<StringName, Variant> > state; if (obj->get_script_instance()) { @@ -1706,6 +1706,9 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so obj->get_script_instance()->get_property_state(state); map[obj->get_instance_ID()] = state; obj->set_script(RefPtr()); + } else { + // no instance found. Let's remove it so we don't loop forever + E->get()->placeholders.erase(E->get()->placeholders.front()->get()); } } #endif |