1 files changed, 41 insertions, 38 deletions

diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp
index f35318e4c6..d1467eea95 100644
--- a/modules/gdscript/gdscript_cache.cpp
+++ b/modules/gdscript/gdscript_cache.cpp
@@ -128,6 +128,10 @@ void GDScriptCache::move_script(const String &p_from, const String &p_to) {
 
 	MutexLock lock(singleton->mutex);
 
+	if (singleton->cleared) {
+		return;
+	}
+
 	for (KeyValue<String, HashSet<String>> &E : singleton->packed_scene_dependencies) {
 		if (E.value.has(p_from)) {
 			E.value.insert(p_to);
@@ -158,6 +162,10 @@ void GDScriptCache::remove_script(const String &p_path) {
 
 	MutexLock lock(singleton->mutex);
 
+	if (singleton->cleared) {
+		return;
+	}
+
 	for (KeyValue<String, HashSet<String>> &E : singleton->packed_scene_dependencies) {
 		if (!E.value.has(p_path)) {
 			continue;
@@ -260,7 +268,7 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro
 	Ref<GDScript> script;
 	r_error = OK;
 	if (singleton->full_gdscript_cache.has(p_path)) {
-		script = Ref<GDScript>(singleton->full_gdscript_cache[p_path]);
+		script = singleton->full_gdscript_cache[p_path];
 		if (!p_update_from_disk) {
 			return script;
 		}
@@ -360,36 +368,10 @@ Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_
 	singleton->packed_scene_cache[p_path] = scene;
 	singleton->packed_scene_dependencies[p_path].insert(p_owner);
 
-	scene->recreate_state();
 	scene->reload_from_file();
 	return scene;
 }
 
-Ref<GDScript> GDScriptCache::get_packed_scene_script(const String &p_path, Error &r_error) {
-	r_error = OK;
-	Ref<PackedScene> scene = get_packed_scene(p_path, r_error);
-
-	if (r_error != OK) {
-		return Ref<GDScript>();
-	}
-
-	int node_count = scene->get_state()->get_node_count();
-	if (node_count == 0) {
-		return Ref<GDScript>();
-	}
-
-	const int ROOT_NODE = 0;
-	for (int i = 0; i < scene->get_state()->get_node_property_count(ROOT_NODE); i++) {
-		if (scene->get_state()->get_node_property_name(ROOT_NODE, i) != SNAME("script")) {
-			continue;
-		}
-
-		return scene->get_state()->get_node_property_value(ROOT_NODE, i);
-	}
-
-	return Ref<GDScript>();
-}
-
 void GDScriptCache::clear_unreferenced_packed_scenes() {
 	if (singleton == nullptr) {
 		return;
@@ -397,6 +379,10 @@ void GDScriptCache::clear_unreferenced_packed_scenes() {
 
 	MutexLock lock(singleton->mutex);
 
+	if (singleton->cleared) {
+		return;
+	}
+
 	for (KeyValue<String, HashSet<String>> &E : singleton->packed_scene_dependencies) {
 		if (E.value.size() > 0 || !ResourceLoader::is_imported(E.key)) {
 			continue;
@@ -407,15 +393,20 @@ void GDScriptCache::clear_unreferenced_packed_scenes() {
 	}
 }
 
-GDScriptCache::GDScriptCache() {
-	singleton = this;
-}
+void GDScriptCache::clear() {
+	if (singleton == nullptr) {
+		return;
+	}
 
-GDScriptCache::~GDScriptCache() {
-	destructing = true;
+	MutexLock lock(singleton->mutex);
+
+	if (singleton->cleared) {
+		return;
+	}
+	singleton->cleared = true;
 
 	RBSet<Ref<GDScriptParserRef>> parser_map_refs;
-	for (KeyValue<String, GDScriptParserRef *> &E : parser_map) {
+	for (KeyValue<String, GDScriptParserRef *> &E : singleton->parser_map) {
 		parser_map_refs.insert(E.value);
 	}
 
@@ -424,13 +415,25 @@ GDScriptCache::~GDScriptCache() {
 			E->clear();
 	}
 
+	singleton->packed_scene_dependencies.clear();
+	singleton->packed_scene_cache.clear();
+
 	parser_map_refs.clear();
-	parser_map.clear();
-	shallow_gdscript_cache.clear();
-	full_gdscript_cache.clear();
+	singleton->parser_map.clear();
+	singleton->shallow_gdscript_cache.clear();
+	singleton->full_gdscript_cache.clear();
+
+	singleton->packed_scene_cache.clear();
+	singleton->packed_scene_dependencies.clear();
+}
 
-	packed_scene_cache.clear();
-	packed_scene_dependencies.clear();
+GDScriptCache::GDScriptCache() {
+	singleton = this;
+}
 
+GDScriptCache::~GDScriptCache() {
+	if (!cleared) {
+		clear();
+	}
 	singleton = nullptr;
 }