Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix crash when extending non-existing GDScript file 

Fixes #21682 with a partial revert of #21411.
The ~Ref() destructor (from 'scriptres') already takes care
of freeing the 'script' resource.
3.1
Rémi Verschelde 2018-09-10 17:24:57 +07:00
parent 6d7a8a6caa
commit 0faafa6f4d
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gdscript/gdscript.cpp
Unescape Escape View File

@ -2112,23 +2112,14 @@ RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_ori
script->set_script_path(p_original_path); // script needs this.
script->set_path(p_original_path);
Error err = script->load_byte_code(p_path);
if (err != OK) {
memdelete(script);
ERR_FAIL_COND_V(err != OK, RES());
}
ERR_FAIL_COND_V(err != OK, RES());
} else {
Error err = script->load_source_code(p_path);
if (err != OK) {
memdelete(script);
ERR_FAIL_COND_V(err != OK, RES());
}
ERR_FAIL_COND_V(err != OK, RES());
script->set_script_path(p_original_path); // script needs this.
script->set_path(p_original_path);
//script->set_name(p_path.get_file());
script->reload();
}