asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21941 from akien-mga/gdscript-memdelete-missing-script

Browse source 
Fix crash when extending non-existing GDScript file
This commit is contained in:
Rémi Verschelde 2018-09-10 23:11:54 +02:00 committed by GitHub
commit c440bf82d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
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_script_path(p_original_path); // script needs this.
script->set_path(p_original_path); script->set_path(p_original_path);
Error err = script->load_byte_code(p_path); Error err = script->load_byte_code(p_path);
ERR_FAIL_COND_V(err != OK, RES());
if (err != OK) {
memdelete(script);
ERR_FAIL_COND_V(err != OK, RES());
}
} else { } else {
Error err = script->load_source_code(p_path); Error err = script->load_source_code(p_path);
ERR_FAIL_COND_V(err != OK, RES());
if (err != OK) {
memdelete(script);
ERR_FAIL_COND_V(err != OK, RES());
}
script->set_script_path(p_original_path); // script needs this. script->set_script_path(p_original_path); // script needs this.
script->set_path(p_original_path); script->set_path(p_original_path);
//script->set_name(p_path.get_file());
script->reload(); script->reload();
} }