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

fix ProjectManager import dialog error

Browse Source 
When Cancel is selected in the import dialog, no subsequent operations should be performed.
This commit is contained in:
molingyu
2024-12-09 18:12:51 +08:00
committed by stark233
parent 0fdbf050e0
commit 39fbcbd2be
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();
}
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) {
// Name and path are set in `ProjectManager::_rename_project`.
project_path->set_editable(false);
@ -978,7 +981,8 @@ void ProjectDialog::_notification(int p_what) {
fdialog_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
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("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);
} 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 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();
};