Fix FileSystem dock won't show any file folders

1 files changed, 15 insertions, 4 deletions

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index f8a82187b9..7d90da05c2 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -550,6 +550,8 @@ void FileSystemDock::_notification(int p_what) {
 		case NOTIFICATION_READY: {
 			EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &FileSystemDock::_feature_profile_changed));
 			EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &FileSystemDock::_fs_changed));
+			EditorFileSystem::get_singleton()->connect("scan_started", callable_mp(this, &FileSystemDock::_scan_started));
+			EditorFileSystem::get_singleton()->connect("scan_stopped", callable_mp(this, &FileSystemDock::_scan_stopped));
 			EditorResourcePreview::get_singleton()->connect("preview_invalidated", callable_mp(this, &FileSystemDock::_preview_invalidated));
 
 			button_file_list_display_mode->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_toggle_file_display));
@@ -566,9 +568,7 @@ void FileSystemDock::_notification(int p_what) {
 
 			_update_display_mode();
 
-			if (EditorFileSystem::get_singleton()->is_scanning()) {
-				_set_scanning_mode();
-			} else {
+			if (!EditorFileSystem::get_singleton()->is_scanning()) {
 				_update_tree(Vector<String>(), true);
 			}
 		} break;
@@ -1326,6 +1326,18 @@ void FileSystemDock::_fs_changed() {
 	set_process(false);
 }
 
+void FileSystemDock::_scan_started(bool p_complete_scan) {
+	if (p_complete_scan) {
+		_set_scanning_mode();
+	}
+}
+
+void FileSystemDock::_scan_stopped(bool p_complete_scan) {
+	if (p_complete_scan) {
+		_fs_changed();
+	}
+}
+
 void FileSystemDock::_set_scanning_mode() {
 	button_hist_prev->set_disabled(true);
 	button_hist_next->set_disabled(true);
@@ -2649,7 +2661,6 @@ bool FileSystemDock::_matches_all_search_tokens(const String &p_text) {
 }
 
 void FileSystemDock::_rescan() {
-	_set_scanning_mode();
 	EditorFileSystem::get_singleton()->scan();
 }