From 6fd2edddc003729755977688790fe9873cbd72f3 Mon Sep 17 00:00:00 2001 From: 31 <31eee384@gmail.com> Date: Wed, 7 Apr 2021 00:56:38 -0500 Subject: Fix 'script_class' null access when reloading a deleted C# script --- modules/mono/csharp_script.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 15a5807370..520262c0eb 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -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 &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()) { -- cgit v1.2.3