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

Merge pull request #47691 from 31/fix-script_class-null-master

Browse source 
Fix `script_class` null access when reloading a deleted C# script
This commit is contained in:
Ignacio Roldán Etcheverry 2021-08-04 06:15:25 +02:00 committed by GitHub
commit 2e362d47c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/mono/csharp_script.cpp
View file

@ -875,6 +875,13 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
// As scripts are going to be reloaded, must proceed without locking here
for (Ref<CSharpScript> &script : scripts) {
// If someone removes a script from a node, deletes the script, builds, adds a script to the
// same node, then builds again, the script might have no path and also no script_class. In
// that case, we can't (and don't need to) reload it.
if (script->get_path().is_empty() && !script->script_class) {
continue;
}
to_reload.push_back(script);
if (script->get_path().is_empty()) {