asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.
This commit is contained in:
Bojidar Marinov 2017-06-16 23:32:46 +03:00
parent b7117ffda0
commit c89d9720f0
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
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

@ -153,6 +153,7 @@ EditorFileSystemDirectory::EditorFileSystemDirectory() {
modified_time = 0; modified_time = 0;
parent = NULL; parent = NULL;
verified = false;
} }
EditorFileSystemDirectory::~EditorFileSystemDirectory() { EditorFileSystemDirectory::~EditorFileSystemDirectory() {
@ -1040,7 +1041,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++) {
@ -1421,6 +1425,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;
@ -1429,7 +1434,9 @@ EditorFileSystem::EditorFileSystem() {
thread_sources = NULL; thread_sources = NULL;
new_filesystem = NULL; new_filesystem = NULL;
abort_scan = false;
scanning_changes = false; scanning_changes = false;
scanning_changes_done = false;
ResourceSaver::set_save_callback(_resource_saved); ResourceSaver::set_save_callback(_resource_saved);
DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);

2
editor/editor_file_system.h
View file

@ -168,8 +168,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;
Set<String> import_extensions; Set<String> import_extensions;