godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EditorFileSystem duplicating root folder in new folders

Browse Source 
Also, add some uninitialized variables into constructors (I like to applease cppcheck).
Also, remove unused md_count.
Fixes #3662.

(cherry picked from commit c89d9720f0)
This commit is contained in:
Bojidar Marinov 2017-06-16 23:32:46 +03:00 committed by Rémi Verschelde
parent bc7ceebc19
commit 9c44d72b3c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_file_system.cpp
View File

@ -207,6 +207,7 @@ EditorFileSystemDirectory::EditorFileSystemDirectory() {
modified_time = 0; modified_time = 0;
parent = NULL; parent = NULL;
verified = false;
} }
EditorFileSystemDirectory::~EditorFileSystemDirectory() { EditorFileSystemDirectory::~EditorFileSystemDirectory() {
@ -1038,7 +1039,10 @@ bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirector
if (idx == -1) { if (idx == -1) {
//does not exist, create i guess? //does not exist, create i guess?
EditorFileSystemDirectory *efsd = memnew(EditorFileSystemDirectory); EditorFileSystemDirectory *efsd = memnew(EditorFileSystemDirectory);
efsd->name = path[i]; efsd->name = path[i];
efsd->parent = fs;
int idx2 = 0; int idx2 = 0;
for (int j = 0; j < fs->get_subdir_count(); j++) { for (int j = 0; j < fs->get_subdir_count(); j++) {
@ -1252,6 +1256,7 @@ EditorFileSystem::EditorFileSystem() {
singleton = this; singleton = this;
filesystem = memnew(EditorFileSystemDirectory); //like, empty filesystem = memnew(EditorFileSystemDirectory); //like, empty
filesystem->parent = NULL;
thread = NULL; thread = NULL;
scanning = false; scanning = false;
@ -1259,7 +1264,9 @@ EditorFileSystem::EditorFileSystem() {
thread_sources = NULL; thread_sources = NULL;
new_filesystem = NULL; new_filesystem = NULL;
abort_scan = false;
scanning_sources = false; scanning_sources = false;
scanning_sources_done = false;
ResourceSaver::set_save_callback(_resource_saved); ResourceSaver::set_save_callback(_resource_saved);
List<String> extensionsl; List<String> extensionsl;

2
editor/editor_file_system.h
View File

@ -193,8 +193,6 @@ class EditorFileSystem : public Node {
void _scan_fs_changes(EditorFileSystemDirectory *p_dir, const ScanProgress &p_progress); void _scan_fs_changes(EditorFileSystemDirectory *p_dir, const ScanProgress &p_progress);
int md_count;
Set<String> valid_extensions; Set<String> valid_extensions;
void _scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress); void _scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress);