diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-14 17:13:21 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-14 17:13:21 +0200 |
commit | 8b271c83153c290729dc9ca38ccab4e35c957297 (patch) | |
tree | 34334865c4dc2bc83a935fddf3830e21cdf88091 /editor | |
parent | 4119fb32cb8b3213bc38886fe4c381db4fe5f24e (diff) | |
parent | 8a82d3e9a777ce956007707089c12d0b71aace88 (diff) | |
download | redot-engine-8b271c83153c290729dc9ca38ccab4e35c957297.tar.gz |
Merge pull request #93161 from Hilderin/fix-crash-importing-ttf
Fix ProgressDialog crash when importing TTF font
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_file_system.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index cdad1f0fab..a1e392cd7d 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1718,6 +1718,7 @@ void EditorFileSystem::update_file(const String &p_file) { } void EditorFileSystem::update_files(const Vector<String> &p_script_paths) { + bool updated = false; for (const String &file : p_script_paths) { ERR_CONTINUE(file.is_empty()); EditorFileSystemDirectory *fs = nullptr; @@ -1747,6 +1748,7 @@ void EditorFileSystem::update_files(const Vector<String> &p_script_paths) { memdelete(fs->files[cpos]); fs->files.remove_at(cpos); + updated = true; } } else { String type = ResourceLoader::get_resource_type(file); @@ -1814,12 +1816,15 @@ void EditorFileSystem::update_files(const Vector<String> &p_script_paths) { if (fs->files[cpos]->type == SNAME("PackedScene")) { _queue_update_scene_groups(file); } + updated = true; } } - _update_pending_script_classes(); - _update_pending_scene_groups(); - call_deferred(SNAME("emit_signal"), "filesystem_changed"); //update later + if (updated) { + _update_pending_script_classes(); + _update_pending_scene_groups(); + call_deferred(SNAME("emit_signal"), "filesystem_changed"); //update later + } } HashSet<String> EditorFileSystem::get_valid_extensions() const { |