diff options
| author | Pieter-Jan Briers | 2018-04-04 16:13:06 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-04-29 14:57:32 +0200 |
| commit | aedc4a4e80dbc6a19b9d69755f13943cf6aa1631 (patch) | |
| tree | a709ae2b875533a47348d4c742de0558c73f1bec | |
| parent | 7417b6adb459eaf896e392251eeeaf79d92ad9ff (diff) | |
| download | godot-aedc4a4e80dbc6a19b9d69755f13943cf6aa1631.tar.gz godot-aedc4a4e80dbc6a19b9d69755f13943cf6aa1631.tar.zst godot-aedc4a4e80dbc6a19b9d69755f13943cf6aa1631.zip | |
Explicitly print an error when --export fails.
Previously this would not explicitly say the export failed.
Sure you might see another error somewhere,
but that's not very reliable/obvious.
(cherry picked from commit 4954982b952f16ead758818d3769e2740f4cba6b)
| -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 15883c671..536b88021 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -447,24 +447,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)); } } } |