summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-31 16:00:12 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-31 16:00:12 +0100
commit8612c12be61c0bc50d9039402fe19cabadfe0b16 (patch)
tree16d8d2c0fe519bbae3cbb869811669bc68ecf645
parent925784df035de92e472211160da3d3420db72722 (diff)
parent38a806e13f294ae8d583b21b3c6b9d20320386d9 (diff)
Merge pull request #72452 from akien-mga/global_class_always_create
Always create global class list, even if empty
-rw-r--r--core/config/project_settings.cpp2
-rw-r--r--editor/editor_file_system.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
index b63fbde7a0..ba9c6e4c60 100644
--- a/core/config/project_settings.cpp
+++ b/core/config/project_settings.cpp
@@ -1138,7 +1138,7 @@ Array ProjectSettings::get_global_class_list() {
Ref<ConfigFile> cf;
cf.instantiate();
if (cf->load(get_global_class_list_path()) == OK) {
- script_classes = cf->get_value("", "list");
+ script_classes = cf->get_value("", "list", Array());
} else {
#ifndef TOOLS_ENABLED
// Script classes can't be recreated in exported project, so print an error.
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 4d0ef3fe8d..644c32e8a4 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1593,7 +1593,7 @@ void EditorFileSystem::_update_pending_script_classes() {
_update_script_classes();
} else {
// In case the class cache file was removed somehow, regenerate it.
- if (ScriptServer::has_global_classes() && !FileAccess::exists(ScriptServer::get_global_class_cache_file_path())) {
+ if (!FileAccess::exists(ScriptServer::get_global_class_cache_file_path())) {
ScriptServer::save_global_classes();
}
}