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

Merge pull request #59920 from marstaik/fix_project_manager 

Fix Project Manager hard crashes due to invalid access to Editor Nodes
This commit is contained in:
Rémi Verschelde 2022-04-05 23:47:28 +02:00 committed by GitHub
parent d405761ee7 da2b5da0c5
commit 956189e0d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/editor_dir_dialog.cpp
View File

@ -156,15 +156,18 @@ void EditorDirDialog::_make_dir_confirm() {
String dir = ti->get_metadata(0);
if (EditorFileSystem::get_singleton()->get_filesystem_path(dir + makedirname->get_text())) {
DirAccessRef d = DirAccess::open(dir);
ERR_FAIL_COND_MSG(!d, "Cannot open directory '" + dir + "'.");
const String stripped_dirname = makedirname->get_text().strip_edges();
if (d->dir_exists(stripped_dirname)) {
mkdirerr->set_text(TTR("Could not create folder. File with that name already exists."));
mkdirerr->popup_centered();
return;
}
DirAccessRef d = DirAccess::open(dir);
ERR_FAIL_COND_MSG(!d, "Cannot open directory '" + dir + "'.");
Error err = d->make_dir(makedirname->get_text());
Error err = d->make_dir(stripped_dirname);
if (err != OK) {
mkdirerr->popup_centered(Size2(250, 80) * EDSCALE);
} else {

8
editor/editor_file_dialog.cpp
View File

@ -1099,16 +1099,18 @@ EditorFileDialog::Access EditorFileDialog::get_access() const {
}
void EditorFileDialog::_make_dir_confirm() {
if (EditorFileSystem::get_singleton()->get_filesystem_path(makedirname->get_text().strip_edges())) {
const String stripped_dirname = makedirname->get_text().strip_edges();
if (dir_access->dir_exists(stripped_dirname)) {
error_dialog->set_text(TTR("Could not create folder. File with that name already exists."));
error_dialog->popup_centered(Size2(250, 50) * EDSCALE);
makedirname->set_text(""); // Reset label.
return;
}
Error err = dir_access->make_dir(makedirname->get_text().strip_edges());
Error err = dir_access->make_dir(stripped_dirname);
if (err == OK) {
dir_access->change_dir(makedirname->get_text().strip_edges());
dir_access->change_dir(stripped_dirname);
invalidate();
update_filters();
update_dir();

14
editor/filesystem_dock.cpp
View File

@ -1427,17 +1427,17 @@ void FileSystemDock::_make_dir_confirm() {
directory = directory.get_base_dir();
}
if (EditorFileSystem::get_singleton()->get_filesystem_path(directory + dir_name)) {
print_verbose("Making folder " + dir_name + " in " + directory);
DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
Error err = da->change_dir(directory);
ERR_FAIL_COND_MSG(err != OK, "Cannot open directory '" + directory + "'.");
if (da->dir_exists(directory)) {
EditorNode::get_singleton()->show_warning(TTR("Could not create folder. File with that name already exists."));
return;
}
print_verbose("Making folder " + dir_name + " in " + directory);
DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
Error err = da->change_dir(directory);
if (err == OK) {
err = da->make_dir(dir_name);
}
err = da->make_dir(dir_name);
if (err == OK) {
print_verbose("FileSystem: calling rescan.");