diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-19 17:57:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 17:57:09 +0100 |
| commit | b2bdfaded3b4c75458bcf855f75cf49e09d07508 (patch) | |
| tree | edfdfcd4de762a23453a965d28d71c9defe92b66 /editor/project_manager.cpp | |
| parent | 52f45122aecae2847fe6b653db06e0a0bae450d1 (diff) | |
| parent | 7839076f95679c85e7adfdccdd671b2927c82f2f (diff) | |
| download | redot-engine-b2bdfaded3b4c75458bcf855f75cf49e09d07508.tar.gz | |
Merge pull request #16825 from akien-mga/projectsettings-setup
Improve error reporting of ProjectSettings::setup()
Diffstat (limited to 'editor/project_manager.cpp')
| -rw-r--r-- | editor/project_manager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index da283b16dc..9c3b09608b 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -304,8 +304,9 @@ private: ProjectSettings *current = memnew(ProjectSettings); - if (current->setup(dir, "")) { - set_message(TTR("Couldn't get project.godot in project path."), MESSAGE_ERROR); + int err = current->setup(dir, ""); + if (err != OK) { + set_message(vformat(TTR("Couldn't load project.godot in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR); } else { ProjectSettings::CustomMap edited_settings; edited_settings["application/config/name"] = project_name->get_text(); @@ -530,8 +531,9 @@ public: ProjectSettings *current = memnew(ProjectSettings); - if (current->setup(project_path->get_text(), "")) { - set_message(TTR("Couldn't get project.godot in the project path."), MESSAGE_ERROR); + int err = current->setup(project_path->get_text(), ""); + if (err != OK) { + set_message(vformat(TTR("Couldn't load project.godot in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR); status_rect->show(); msg->show(); get_ok()->set_disabled(true); |