godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Merge pull request #100197 from shitake2333/fix_project_manager_import_dialog_error

Browse Source 
Fix ProjectManager import dialog error
This commit is contained in:
Thaddeus Crews
2025-11-04 19:48:15 -06:00
parent 40470e6d42 39fbcbd2be
commit 939c7d5890
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/project_manager/project_dialog.cpp
View File

@@ -830,7 +830,10 @@ void ProjectDialog::ask_for_path_and_show() {
_browse_project_path(); _browse_project_path();
} }
void ProjectDialog::show_dialog(bool p_reset_name) { void ProjectDialog::show_dialog(bool p_reset_name, bool p_is_confirmed) {
if (mode == MODE_IMPORT && !p_is_confirmed) {
return;
}
if (mode == MODE_RENAME) { if (mode == MODE_RENAME) {
// Name and path are set in `ProjectManager::_rename_project`. // Name and path are set in `ProjectManager::_rename_project`.
project_path->set_editable(false); project_path->set_editable(false);
@@ -978,7 +981,8 @@ void ProjectDialog::_notification(int p_what) {
fdialog_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM); fdialog_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
fdialog_project->connect("dir_selected", callable_mp(this, &ProjectDialog::_project_path_selected)); fdialog_project->connect("dir_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
fdialog_project->connect("file_selected", callable_mp(this, &ProjectDialog::_project_path_selected)); fdialog_project->connect("file_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
fdialog_project->connect("canceled", callable_mp(this, &ProjectDialog::show_dialog).bind(false), CONNECT_DEFERRED); fdialog_project->connect(SceneStringName(confirmed), callable_mp(this, &ProjectDialog::show_dialog).bind(false, true), CONNECT_DEFERRED);
fdialog_project->connect("canceled", callable_mp(this, &ProjectDialog::show_dialog).bind(false, false), CONNECT_DEFERRED);
callable_mp((Node *)this, &Node::add_sibling).call_deferred(fdialog_project, false); callable_mp((Node *)this, &Node::add_sibling).call_deferred(fdialog_project, false);
} break; } break;
} }

2
editor/project_manager/project_dialog.h
View File

@@ -152,7 +152,7 @@ public:
void set_duplicate_can_edit(bool p_duplicate_can_edit); void set_duplicate_can_edit(bool p_duplicate_can_edit);
void ask_for_path_and_show(); void ask_for_path_and_show();
void show_dialog(bool p_reset_name = true); void show_dialog(bool p_reset_name = true, bool p_is_confirmed = true);
ProjectDialog(); ProjectDialog();
}; };