diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-06 08:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 08:36:16 +0200 |
| commit | ec110076caca7a75ffb4795c32362bc52151dbcc (patch) | |
| tree | 8056f5968253ed4e73104eb29f5c222f5cdb0902 /editor/editor_node.cpp | |
| parent | bdfa10fc8f6ecc4e4824ca9bb32ece782ede1b43 (diff) | |
| parent | 4954982b952f16ead758818d3769e2740f4cba6b (diff) | |
Merge pull request #17970 from PJB3005/18-04-04-commandline-export-error-clarity
Explicitly print an error when --export fails.
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 7936cf446f..0bca78b493 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -470,24 +470,28 @@ void EditorNode::_fs_changed() { } if (preset.is_null()) { String err = "Unknown export preset: " + export_defer.preset; - ERR_PRINT(err.utf8().get_data()); + ERR_PRINTS(err); } else { Ref<EditorExportPlatform> platform = preset->get_platform(); if (platform.is_null()) { String err = "Preset \"" + export_defer.preset + "\" doesn't have a platform."; - ERR_PRINT(err.utf8().get_data()); + ERR_PRINTS(err); } else { // ensures export_project does not loop infinitely, because notifications may // come during the export export_defer.preset = ""; + Error err; if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) { if (export_defer.path.ends_with(".zip")) { - platform->save_zip(preset, export_defer.path); + err = platform->save_zip(preset, export_defer.path); } else if (export_defer.path.ends_with(".pck")) { - platform->save_pack(preset, export_defer.path); + err = platform->save_pack(preset, export_defer.path); } } else { - platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0); + err = platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0); + } + if (err != OK) { + ERR_PRINTS(vformat(TTR("Project export failed with error code %d."), (int)err)); } } } |