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

Fixes godot crash or give unclear message when exporting with invalid args

This commit is contained in:
jsjtxietian 2024-08-01 13:00:05 +08:00
parent 7c383767a2
commit 1d09970404
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/main.cpp
View File

@ -3546,13 +3546,16 @@ int Main::start() {
gdscript_docs_path = E->next()->get(); gdscript_docs_path = E->next()->get();
#endif #endif
} else if (E->get() == "--export-release") { } else if (E->get() == "--export-release") {
ERR_FAIL_COND_V_MSG(!editor && !found_project, EXIT_FAILURE, "Please provide a valid project path when exporting, aborting.");
editor = true; //needs editor editor = true; //needs editor
_export_preset = E->next()->get(); _export_preset = E->next()->get();
} else if (E->get() == "--export-debug") { } else if (E->get() == "--export-debug") {
ERR_FAIL_COND_V_MSG(!editor && !found_project, EXIT_FAILURE, "Please provide a valid project path when exporting, aborting.");
editor = true; //needs editor editor = true; //needs editor
_export_preset = E->next()->get(); _export_preset = E->next()->get();
export_debug = true; export_debug = true;
} else if (E->get() == "--export-pack") { } else if (E->get() == "--export-pack") {
ERR_FAIL_COND_V_MSG(!editor && !found_project, EXIT_FAILURE, "Please provide a valid project path when exporting, aborting.");
editor = true; editor = true;
_export_preset = E->next()->get(); _export_preset = E->next()->get();
export_pack_only = true; export_pack_only = true;
@ -3564,6 +3567,8 @@ int Main::start() {
if (parsed_pair) { if (parsed_pair) {
E = E->next(); E = E->next();
} }
} else if (E->get().begins_with("--export-")) {
ERR_FAIL_V_MSG(EXIT_FAILURE, "Missing export preset name, aborting.");
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
// Handle case where no path is given to --doctool. // Handle case where no path is given to --doctool.
@ -4407,7 +4412,7 @@ bool Main::iteration() {
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (wait_for_import && EditorFileSystem::get_singleton()->doing_first_scan()) { if (wait_for_import && EditorFileSystem::get_singleton() && EditorFileSystem::get_singleton()->doing_first_scan()) {
exit = false; exit = false;
} }
#endif #endif