diff options
| author | marxin <mliska@suse.cz> | 2019-02-12 21:10:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 19:44:12 +0100 |
| commit | 8d51618949d5ea8a94e0f504401e8f852a393968 (patch) | |
| tree | 6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /editor/project_manager.cpp | |
| parent | 132e2f458df7a3551a251d68afeccd0362ca6be2 (diff) | |
| download | redot-engine-8d51618949d5ea8a94e0f504401e8f852a393968.tar.gz | |
Add -Wshadow=local to warnings and fix reported issues.
Fixes #25316.
Diffstat (limited to 'editor/project_manager.cpp')
| -rw-r--r-- | editor/project_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 0a24f325fd..a3bcfa6e70 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -434,22 +434,22 @@ private: if (mode == MODE_RENAME) { - String dir = _test_path(); - if (dir == "") { + String dir2 = _test_path(); + if (dir2 == "") { set_message(TTR("Invalid project path (changed anything?)."), MESSAGE_ERROR); return; } ProjectSettings *current = memnew(ProjectSettings); - int err = current->setup(dir, ""); + int err = current->setup(dir2, ""); 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(); - if (current->save_custom(dir.plus_file("project.godot"), edited_settings, Vector<String>(), true) != OK) { + if (current->save_custom(dir2.plus_file("project.godot"), edited_settings, Vector<String>(), true) != OK) { set_message(TTR("Couldn't edit project.godot in project path."), MESSAGE_ERROR); } } |