diff options
| author | jsjtxietian <jsjtxietian@outlook.com> | 2024-08-01 13:00:05 +0800 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-17 08:57:44 +0200 |
| commit | fb1758ce235e2711fe256394144db4cc8d887447 (patch) | |
| tree | c0f389c68a9311118def499b5b08e01f412fa1e6 /main | |
| parent | c4525f24e316d14678b63441babc8c5e17f73707 (diff) | |
| download | redot-engine-fb1758ce235e2711fe256394144db4cc8d887447.tar.gz | |
Fixes godot crash or give unclear message when exporting with invalid args
(cherry picked from commit 1d099704049b2bfaac3680758dbdd163be0355f5)
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index ca9b9d732f..dbd9752948 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -3371,13 +3371,16 @@ int Main::start() { gdscript_docs_path = E->next()->get(); #endif } 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 _export_preset = E->next()->get(); } 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 _export_preset = E->next()->get(); export_debug = true; } 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; _export_preset = E->next()->get(); export_pack_only = true; @@ -3389,6 +3392,8 @@ int Main::start() { if (parsed_pair) { E = E->next(); } + } else if (E->get().begins_with("--export-")) { + ERR_FAIL_V_MSG(EXIT_FAILURE, "Missing export preset name, aborting."); } #ifdef TOOLS_ENABLED // Handle case where no path is given to --doctool. @@ -4227,7 +4232,7 @@ bool Main::iteration() { } #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; } #endif |